From b3ef46f8347fafa583e2e0bb87377a6e0a25a101 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 12 Dec 2017 15:19:09 +0100 Subject: [PATCH] update submodule branches --- .gitmodules | 10 +++++----- lib/mezzanine | 2 +- lib/mezzanine-agenda | 2 +- lib/mezzanine-organization | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5fa55236..34ac1c60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/lib/mezzanine b/lib/mezzanine index 36b6bffa..44096bfd 160000 --- a/lib/mezzanine +++ b/lib/mezzanine @@ -1 +1 @@ -Subproject commit 36b6bffac40111c37fd3f0ef435ffc3f79f93793 +Subproject commit 44096bfdb488664d31c238be26bf0b29c1ad7c3a diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index b7fad817..643ef1cb 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit b7fad817efbd084ec2eccb4bfc60fd7fba02f2c3 +Subproject commit 643ef1cbe3cedf3c2781754aa75d0654fa09fcec diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index 495797e4..8c5ad697 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit 495797e429702dccf35dc0a8ddbc806ab8c5daf5 +Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b -- 2.39.5