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

Merge branch 'master' into master
---

542d5189d9622aea7ff37069f606b11357a9fd42
diff --cc .gitmodules
index 85026ea,188be13..f6849fb
--- a/.gitmodules
+++ b/.gitmodules
@@@ -108,6 -108,15 +108,21 @@@
  [submodule "static/stands/coderdojo_belgium"]
  	path = static/stands/coderdojo_belgium
  	url = https://github.com/valeriecdj/FosdemStatic.git
++
 +[submodule "content/stands/haiku"]
 +	path = content/stands/haiku
 +	url = https://github.com/pulkomandy/fosdem-stands-haiku.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
++