]> git.parisson.com Git - mezzo.git/commitdiff
fix branches
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 27 Nov 2017 13:10:41 +0000 (14:10 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 27 Nov 2017 13:10:41 +0000 (14:10 +0100)
.gitmodules
lib/mezzanine-organization

index 6ee93d5c9562b46599279223d466e005c88c63f8..b73c3b00561af8efdee00cd6f6927dd1c7e0afe9 100644 (file)
@@ -10,7 +10,7 @@
        path = lib/mezzanine-organization-themes
        url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
        branch = master
-        ignore = dirty
+    ignore = dirty
 [submodule "bin"]
        path = bin
        url = https://github.com/Ircam-Web/mezzo-bin.git
 [submodule "lib/grappelli-safe"]
        path = lib/grappelli-safe
        url = https://github.com/yomguy/grappelli-safe.git
-        branch = dynamic_stacked
-        ignore = dirty
+    branch = dynamic_stacked
+    ignore = dirty
 [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
        url = https://github.com/Ircam-Web/mezzanine-organization.git
+       branch = vertigo
 [submodule "var"]
        path = var
        url = git+ssh://git@git.forge.ircam.fr/vertigo-data.git
index a7b70c0400a7b5127ad459e8ca69b562edff49c9..7e338c8c92db22c71694cf3a5e05c3a720e11dbe 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a7b70c0400a7b5127ad459e8ca69b562edff49c9
+Subproject commit 7e338c8c92db22c71694cf3a5e05c3a720e11dbe