]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 29 Mar 2018 11:16:42 +0000 (13:16 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 29 Mar 2018 11:16:42 +0000 (13:16 +0200)
1  2 
.gitmodules
lib/mezzanine
lib/mezzanine-organization
lib/mezzanine-organization-themes

diff --cc .gitmodules
index dee8e787b54ea1f896fd281716d9f07228b4b4a2,6b47ed2c641d01ce5c0f1015fd5fc960b4b1f981..556a79d3641815861ac2dbf6f999d3be469ef18a
@@@ -5,12 -5,13 +5,13 @@@
      branch-dev = mezzo-dev
  [submodule "lib/mezzanine-agenda"]
      path = lib/mezzanine-agenda
 -    url = git@github.com:Ircam-Web/mezzanine-agenda.git
 +    url = https://github.com/Ircam-Web/mezzanine-agenda.git
      branch-master = master
      branch-dev = dev
+     ignore = dirty
  [submodule "lib/mezzanine-organization-themes"]
      path = lib/mezzanine-organization-themes
 -    url = git@github.com:Ircam-Web/mezzanine-organization-themes.git
 +    url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
      branch-master = master
      branch-dev = dev
      ignore = dirty
diff --cc lib/mezzanine
index 63ad6bb955cd69cb75f6cf5205c9e07a9bd1f6be,08370e7d2360119e99355895cd686f4c3658f7da..aae3c4e281f7d79d1f2fe7c1b27f6ba5e7963134
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 63ad6bb955cd69cb75f6cf5205c9e07a9bd1f6be
 -Subproject commit 08370e7d2360119e99355895cd686f4c3658f7da
++Subproject commit aae3c4e281f7d79d1f2fe7c1b27f6ba5e7963134
index e30ab1270da5993a06037745a8a3496fb45e7bc0,09c4c7c45efc85e4ff025902478bd34b7e3e71dc..4dcc1668a0762e236cd51b47e0ecfeb8c57d440d
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e30ab1270da5993a06037745a8a3496fb45e7bc0
 -Subproject commit 09c4c7c45efc85e4ff025902478bd34b7e3e71dc
++Subproject commit 4dcc1668a0762e236cd51b47e0ecfeb8c57d440d
index 5f04a06f71e6ea6de70445101d9d4fb4eb29d603,898aa3f81cb3db53992a77f0425f34f2cd8f7670..f1076d51ba23d9a7c4b567be81fb5b4742d1c8d4
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5f04a06f71e6ea6de70445101d9d4fb4eb29d603
 -Subproject commit 898aa3f81cb3db53992a77f0425f34f2cd8f7670
++Subproject commit f1076d51ba23d9a7c4b567be81fb5b4742d1c8d4