Merge branch 'develop' into 'master'

Fixed submodules to branch master on new installs See merge request digitaldemocratic/digitaldemocratic!23
2021-06-09 09:03:39 +00:00 · 2021-06-09 09:03:39 +00:00 · 90bdd62de2
parent 81434a1766 819e636ab4
commit 90bdd62de2
3 changed files with 4 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,8 @@
 [submodule "isard-apps"]
 	path = isard-apps
 	url = https://gitlab.com/isard/isard-apps
+        branch = master
 [submodule "isard-sso"]
 	path = isard-sso
 	url = https://gitlab.com/isard/isard-sso
+        branch = master
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9a7202cf985ecf0960c52bbb111dcf87a5e36f04
+Subproject commit 19a3d1ea8b6266bbaa6f7eb01fd609c9c93c023c
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 50418914c9cd817fefbb684aa6e3952eb2e06537
+Subproject commit 90d78d81dbf37d312238238c8557892f11a0cd6f