From d527117ed17356fde1aa1ed667f71a2eaae8108a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 27 Nov 2017 14:10:41 +0100 Subject: [PATCH] fix branches --- .gitmodules | 7 ++++--- lib/mezzanine-organization | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6ee93d5c..b73c3b00 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -18,11 +18,12 @@ [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 diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index a7b70c04..7e338c8c 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit a7b70c0400a7b5127ad459e8ca69b562edff49c9 +Subproject commit 7e338c8c92db22c71694cf3a5e05c3a720e11dbe -- 2.39.5