From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 14 Oct 2016 14:10:19 +0000 (+0200)
Subject: pull master only on master branch
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=07a80547498ab55ec5e2b225a300af4332d6c351;p=mezzo.git

pull master only on master branch
---

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