Merge branch 'master' into cguindon/master/fossdem21

diff --git a/.gitmodules b/.gitmodules
index 4d028e26ea89121db71e39aaf9b9d31c0d1896cd..188be13a5fd1024efae0eac518e1b1d86e159d11 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -114,3 +114,9 @@
 [submodule "content/stands/eclipse-foundation"]
        path = content/stands/eclipse-foundation
        url = https://github.com/EclipseFdn/fosdem2021-content.git
+[submodule "content/stands/mariadb_foundation"]
+       path = content/stands/mariadb_foundation
+       url = https://github.com/MariaDB-FOSDEM/stand-content.git
+[submodule "static/stands/mariadb_foundation"]
+       path = static/stands/mariadb_foundation
+       url = https://github.com/MariaDB-FOSDEM/stand-static.git

diff --git a/content/stands/mariadb_foundation b/content/stands/mariadb_foundation
new file mode 160000 (submodule)
index 0000000..318fc48
--- /dev/null
+++ b/content/stands/mariadb_foundation
@@ -0,0 +1 @@
+Subproject commit 318fc48efd4d1cb21c1b5e797374dad61a724401

diff --git a/static/stands/mariadb_foundation b/static/stands/mariadb_foundation
new file mode 160000 (submodule)
index 0000000..8d5388a
--- /dev/null
+++ b/static/stands/mariadb_foundation
@@ -0,0 +1 @@
+Subproject commit 8d5388a6c78325538d756378e41e0cd61248d6b7