From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 27 Nov 2017 13:11:54 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=743487dfa972920cd855943faf19a42899193196;p=mezzo.git

Merge branch 'master' into dev
---

743487dfa972920cd855943faf19a42899193196
diff --cc .gitmodules
index 10012c84,b73c3b00..0c39339d
--- a/.gitmodules
+++ b/.gitmodules
@@@ -23,6 -23,10 +23,7 @@@
  [submodule "lib/mezzanine-organization"]
  	path = lib/mezzanine-organization
  	url = https://github.com/Ircam-Web/mezzanine-organization.git
+ 	branch = vertigo
 -[submodule "var"]
 -	path = var
 -	url = git+ssh://git@git.forge.ircam.fr/vertigo-data.git
  [submodule "lib/cartridge"]
  	path = lib/cartridge
  	url = https://github.com/yomguy/cartridge.git