]> git.parisson.com Git - mezzo.git/commitdiff
update submodule branches
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 12 Dec 2017 14:19:09 +0000 (15:19 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 12 Dec 2017 14:19:09 +0000 (15:19 +0100)
.gitmodules
lib/mezzanine
lib/mezzanine-agenda
lib/mezzanine-organization

index 5fa55236a80a36630486415493bdf6f23e7a67a1..34ac1c6093af0f513e2309fcbd0016b6bcc00048 100644 (file)
@@ -1,18 +1,18 @@
 [submodule "lib/mezzanine"]
        path = lib/mezzanine
        url = https://github.com/yomguy/mezzanine.git
-    branch-master = mezzo
-    branch-dev = mezzo
+    branch-master = mezzo-master
+    branch-dev = mezzo-dev
 [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
     url = https://github.com/Ircam-Web/mezzanine-agenda.git
     branch-master = master
-    branch-dev = master
+    branch-dev = dev
 [submodule "lib/mezzanine-organization-themes"]
        path = lib/mezzanine-organization-themes
        url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
     branch-master = master
-    branch-dev = master
+    branch-dev = dev
     ignore = dirty
 [submodule "bin"]
        path = bin
@@ -29,7 +29,7 @@
        path = lib/mezzanine-organization
        url = https://github.com/Ircam-Web/mezzanine-organization.git
     branch-master = master
-    branch-dev = master
+    branch-dev = dev
     ignore = dirty
 [submodule "lib/cartridge"]
        path = lib/cartridge
index 36b6bffac40111c37fd3f0ef435ffc3f79f93793..44096bfdb488664d31c238be26bf0b29c1ad7c3a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 36b6bffac40111c37fd3f0ef435ffc3f79f93793
+Subproject commit 44096bfdb488664d31c238be26bf0b29c1ad7c3a
index b7fad817efbd084ec2eccb4bfc60fd7fba02f2c3..643ef1cbe3cedf3c2781754aa75d0654fa09fcec 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b7fad817efbd084ec2eccb4bfc60fd7fba02f2c3
+Subproject commit 643ef1cbe3cedf3c2781754aa75d0654fa09fcec
index 495797e429702dccf35dc0a8ddbc806ab8c5daf5..8c5ad697698500906e05d7ce7c793ff70d6cbb5b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 495797e429702dccf35dc0a8ddbc806ab8c5daf5
+Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b