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

Merge branch 'master' into master
---

aceea2d61d352aebc3754671211f63a7d7d0626e
diff --cc .gitmodules
index 4b6810d,11fc286..deb88ba
--- a/.gitmodules
+++ b/.gitmodules
@@@ -15,33 -15,55 +15,65 @@@ path = static/stands/free_software_foun
  url = https://git.fsfe.org/FSFE/fosdem21-static.git
  
  [submodule "content/stands/kiwi_tcms"]
- path = content/stands/kiwi_tcms
- url = https://github.com/kiwitcms/fosdem-2021-stand-content.git
+ 	path = content/stands/kiwi_tcms
+ 	url = https://github.com/kiwitcms/fosdem-2021-stand-content.git
  
  [submodule "static/stands/kiwi_tcms"]
- path = static/stands/kiwi_tcms
- url = https://github.com/kiwitcms/fosdem-2021-stand-static.git
+ 	path = static/stands/kiwi_tcms
+ 	url = https://github.com/kiwitcms/fosdem-2021-stand-static.git
  
  [submodule "content/stands/pharo"]
- path = content/stands/pharo
- url = https://github.com/pharo-divulgation/pharo-fosdem-content.git
+ 	path = content/stands/pharo
+ 	url = https://github.com/pharo-divulgation/pharo-fosdem-content.git
  
  [submodule "static/stands/pharo"]
- path = static/stands/pharo
- url = https://github.com/pharo-divulgation/pharo-fosdem-static.git
+ 	path = static/stands/pharo
+ 	url = https://github.com/pharo-divulgation/pharo-fosdem-static.git
  
  [submodule "static/stands/postgresql"]
- path = static/stands/postgresql
- url = https://git.postgresql.org/git/fosdem2021-static.git
+ 	path = static/stands/postgresql
+ 	url = https://git.postgresql.org/git/fosdem2021-static.git
  
  [submodule "content/stands/postgresql"]
 +path = content/stands/postgresql
 +url = https://git.postgresql.org/git/fosdem2021-content.git
 +
 +[submodule "content/stands/xwiki___cryptpad"]
 +path = content/stands/xwiki___cryptpad
 +url = https://github.com/xwikisas/fosdem-stand-content.git
 +
 +[submodule "static/stands/xwiki___cryptpad"]
 +path = static/stands/xwiki___cryptpad
 +url = https://github.com/xwikisas/fosdem-stand-static.git
+ 	path = content/stands/postgresql
+ 	url = https://git.postgresql.org/git/fosdem2021-content.git
+ [submodule "static/stands/box86"]
+ 	path = static/stands/box86
+ 	url = https://github.com/rajdakin/box86-fosdem2021-static.git
+ [submodule "content/stands/box86"]
+ 	path = content/stands/box86
+ 	url = https://github.com/rajdakin/box86-fosdem2021-content.git
+ [submodule "content/stands/ntop"]
+ 	path = content/stands/ntop
+ 	url = https://github.com/ntop/fosdem21-content.git
+ [submodule "static/stands/ntop"]
+ 	path = static/stands/ntop
+ 	url = https://github.com/ntop/fosdem21-static.git
+ [submodule "content/stands/sesame_discovery"]
+ 	path = content/stands/sesame_discovery
+ 	url = https://github.com/SesameEngineering/fosdem21-content.git
+ [submodule "static/stands/sesame_discovery"]
+ 	path = static/stands/sesame_discovery
+ 	url = https://github.com/SesameEngineering/fosdem21-static.git
+ [submodule "content/stands/the_gnome_foundation"]
+ 	path = content/stands/the_gnome_foundation
+ 	url = https://github.com/gnome/stands-website.git
+ [submodule "static/stands/the_gnome_foundation"]
+ 	path = static/stands/the_gnome_foundation
+ 	url = https://github.com/gnome/stands-website.git
+ [submodule "content/stands/mit_app_inventor"]
+ 	path = content/stands/mit_app_inventor
+ 	url = https://github.com/mit-cml/fosdem-stand.git
+ [submodule "static/stands/mit_app_inventor"]
+ 	path = static/stands/mit_app_inventor
+ 	url = https://github.com/mit-cml/fosdem-static.git