From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 19 Feb 2018 23:37:01 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.7.0~2^2~4^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=81e34d15015a3a6004393f2d5b042e0652f3d573;p=telemeta.git

Merge branch 'master' into dev
---

81e34d15015a3a6004393f2d5b042e0652f3d573
diff --cc app/scripts/app.sh
index b8eb06a7,461191af..0d70c0c0
mode 100755,100644..100755
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh