From 07a80547498ab55ec5e2b225a300af4332d6c351 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 14 Oct 2016 16:10:19 +0200 Subject: [PATCH] pull master only on master branch --- scripts/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 48008038..bbb32055 100755 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -2,7 +2,7 @@ # Use this script to update a dev/prod server -git pull origin dev +git pull origin master git submodule foreach git pull origin master docker-compose run app python /srv/app/manage.py migrate # docker-compose run app python /srv/app/manage.py update_translation_fields -- 2.39.5