From: Guillaume Pellerin Date: Mon, 4 Dec 2017 14:15:10 +0000 (+0100) Subject: Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f56dd43bf8811c5aa0e4b63505adb46ae263279e;p=mezzo.git Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev --- f56dd43bf8811c5aa0e4b63505adb46ae263279e diff --cc .gitmodules index 0c39339d,b1bd4d08..d56ba2c5 --- a/.gitmodules +++ b/.gitmodules @@@ -18,12 -22,16 +22,21 @@@ [submodule "lib/grappelli-safe"] path = lib/grappelli-safe url = https://github.com/yomguy/grappelli-safe.git - branch-master = dynamic_stacked - branch-dev = dynamic_stacked + branch = dynamic_stacked + ignore = dirty +[submodule "lib/mezzanine-organization"] + path = lib/mezzanine-organization + url = https://github.com/Ircam-Web/mezzanine-organization.git - branch = vertigo ++ branch-master = vertigo ++ branch-dev = vertigo-dev + ignore = dirty + [submodule "lib/mezzanine-organization"] + path = lib/mezzanine-organization + 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 diff --cc lib/mezzanine-organization index 7e338c8c,0dc91551..8c5ad697 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 7e338c8c92db22c71694cf3a5e05c3a720e11dbe -Subproject commit 0dc91551ecadc3b12d5502dcbb16fda0e15bb636 ++Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b