From c3b6300d709faa114a497b80dc04e3651cb0e96a Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Fri, 9 Sep 2016 22:25:38 +0200
Subject: [PATCH] no message

---
 www/misc/entrypoint.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/misc/entrypoint.sh b/www/misc/entrypoint.sh
index dd3c3e6..6947da0 100644
--- a/www/misc/entrypoint.sh
+++ b/www/misc/entrypoint.sh
@@ -1,8 +1,7 @@
 service rsyslog restart
-service nginx restart
 
 cd /opt/warpinfra;
-python3 manage.py makemigrations
+python3 manage.py makemigrations  --merge
 python3 manage.py migrate
 python3 manage.py collectstatic --noinput
 cp -r /opt/warpinfra/static /opt/socket/
-- 
GitLab