Merge branch 'master' into cguindon/master/fossdem21
authorPieter De Praetere <pieter.de.praetere@helptux.be>
Fri, 29 Jan 2021 22:05:02 +0000 (23:05 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Jan 2021 22:05:02 +0000 (23:05 +0100)
1  2 
.gitmodules

diff --cc .gitmodules
index 4d028e26ea89121db71e39aaf9b9d31c0d1896cd,e94d726db360310b118efaf397d09a3c5ec63bb4..188be13a5fd1024efae0eac518e1b1d86e159d11
  [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