From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 4 Oct 2018 13:12:19 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0634be7142e59e80f5672a8f5ad02341a46c2760;p=mezzo.git

Merge branch 'master' into dev
---

0634be7142e59e80f5672a8f5ad02341a46c2760
diff --cc app/bin/app.sh
index 0390cef0,0390cef0..b37b7e81
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@@ -25,7 -25,7 +25,7 @@@ gid='www-data
  # pip install -e /srv/lib/mypackage...
  
  # Install (staging) libs
--/srv/bin/build/local/setup_lib.sh
++# /srv/bin/build/local/setup_lib.sh
  
  # waiting for other services
  sh $app/bin/wait.sh