From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 1 Nov 2017 04:18:14 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=818bbac105db57280cd4ccd314a96d810fd1db95;p=mezzo.git

Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
---

818bbac105db57280cd4ccd314a96d810fd1db95
diff --cc .gitmodules
index e2378b7a,10012c84..6ee93d5c
--- a/.gitmodules
+++ b/.gitmodules
@@@ -23,6 -23,6 +23,9 @@@
  [submodule "lib/mezzanine-organization"]
  	path = lib/mezzanine-organization
  	url = https://github.com/Ircam-Web/mezzanine-organization.git
 +[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