From: Pieter De Praetere <pieter.de.praetere@helptux.be>
Date: Fri, 29 Jan 2021 22:05:02 +0000 (+0100)
Subject: Merge branch 'master' into cguindon/master/fossdem21
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e575bbde73e91fe13abc11a03ed27a4ac1749d5;p=stands-website.git

Merge branch 'master' into cguindon/master/fossdem21
---

3e575bbde73e91fe13abc11a03ed27a4ac1749d5
diff --cc .gitmodules
index 4d028e2,e94d726..188be13
--- a/.gitmodules
+++ b/.gitmodules
@@@ -108,9 -108,9 +108,15 @@@
  [submodule "static/stands/coderdojo_belgium"]
  	path = static/stands/coderdojo_belgium
  	url = https://github.com/valeriecdj/FosdemStatic.git
 +[submodule "static/stands/eclipse-foundation"]
 +	path = static/stands/eclipse-foundation
 +	url = https://github.com/EclipseFdn/fosdem2021-static.git
 +[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