]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 1 Nov 2017 04:18:14 +0000 (05:18 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 1 Nov 2017 04:18:14 +0000 (05:18 +0100)
1  2 
.gitmodules

diff --cc .gitmodules
index e2378b7a4cf68bf39171e0160e6c805e8e27add7,10012c84131519fb281692658624cd83e5fb1814..6ee93d5c9562b46599279223d466e005c88c63f8
@@@ -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