]> git.parisson.com Git - mezzo.git/commitdiff
[git] : update submodules
authorEmilie <zawadzki@ircam.fr>
Thu, 2 Nov 2017 10:56:05 +0000 (11:56 +0100)
committerEmilie <zawadzki@ircam.fr>
Thu, 2 Nov 2017 10:56:05 +0000 (11:56 +0100)
.gitmodules

index 10012c84131519fb281692658624cd83e5fb1814..b1bd4d083d385c98b3eb00c8db40a8434d11e5ab 100644 (file)
@@ -1,28 +1,37 @@
 [submodule "lib/mezzanine"]
        path = lib/mezzanine
        url = https://github.com/yomguy/mezzanine.git
-       branch = jquery
+    branch-master = master
+    branch-dev = master
 [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
-       url = https://github.com/yomguy/mezzanine-agenda.git
-       branch = master
+    url = https://github.com/Ircam-Web/mezzanine-agenda.git 
+    branch-master = master
+    branch-dev = master
 [submodule "lib/mezzanine-organization-themes"]
        path = lib/mezzanine-organization-themes
        url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
-       branch = master
-        ignore = dirty
+    branch-master = master
+    branch-dev = master 
+    ignore = dirty
 [submodule "bin"]
        path = bin
        url = https://github.com/Ircam-Web/mezzo-bin.git
-       branch = master
+    branch-master = master
+    branch-dev = master
 [submodule "lib/grappelli-safe"]
        path = lib/grappelli-safe
        url = https://github.com/yomguy/grappelli-safe.git
-        branch = dynamic_stacked
-        ignore = dirty
+    branch-master = dynamic_stacked
+    branch-dev = dynamic_stacked
+    ignore = dirty
 [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
-       url = https://github.com/Ircam-Web/mezzanine-organization.git
+    url = https://github.com/Ircam-Web/mezzanine-organization.git
+    branch-master = master
+    branch-dev = master
 [submodule "lib/cartridge"]
        path = lib/cartridge
-       url = https://github.com/yomguy/cartridge.git
+    url = https://github.com/Ircam-Web/cartridge.git
+    branch-master = master
+    branch-dev = master