From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 11 Jul 2016 15:56:05 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9905ea977dd5733fff2a80edba2cbffd60712dab;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
---

9905ea977dd5733fff2a80edba2cbffd60712dab
diff --cc install.py
index 93e4ca9b,98d4da0f..93e4ca9b
mode 100755,100644..100644
--- a/install.py
+++ b/install.py