From: Emilie <zawadzki@ircam.fr>
Date: Thu, 14 Dec 2017 14:25:54 +0000 (+0100)
Subject: [Merge] : mezzo/dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e70ad31842f70b6990eded972dd796c21adb6a4d;p=mezzo.git

[Merge] : mezzo/dev
---

e70ad31842f70b6990eded972dd796c21adb6a4d
diff --cc .gitmodules
index 8d9623b3,59e4004c..a2c4504b
--- a/.gitmodules
+++ b/.gitmodules
@@@ -27,18 -27,12 +27,18 @@@
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
  	path = lib/mezzanine-organization
- 	url = https://github.com/Ircam-Web/mezzanine-organization.git
+ 	url = git@github.com:Ircam-Web/mezzanine-organization.git
      branch-master = master
-     branch-dev = master
+     branch-dev = dev
      ignore = dirty
 +[submodule "var"]
 +	path = var
 +	url = git+ssh://git@git.forge.ircam.fr/ircam-www-data.git
 +    ignore = dirty
 +	branch-master = master
 +	branch-dev = master
  [submodule "lib/cartridge"]
  	path = lib/cartridge
-     url = https://github.com/Ircam-Web/cartridge.git
+     url = git@github.com:Ircam-Web/cartridge.git
      branch-master = master
      branch-dev = master