Merge branch 'master' of git://github.com/GNOME/stands-website into GNOME-master

diff --cc .gitmodules
index 16de47edd6ecc839ef1e45cdc1e1a8f5c805a10d,17a410fbeed4e6240bc1b9b9b2e9b3fb52e9839b..2491f18e9dc1fb873bd3aca6522feb515bb6ac36
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -7,12 -7,12 +7,12 @@@
        url = https://github.com/tribe29/checkmk-fosdem-static.git
  
  [submodule "content/stands/free_software_foundation_europe"]
--path = content/stands/free_software_foundation_europe
--url = https://git.fsfe.org/FSFE/fosdem21-content.git
++      path = content/stands/free_software_foundation_europe
++      url = https://git.fsfe.org/FSFE/fosdem21-content.git
  
  [submodule "static/stands/free_software_foundation_europe"]
--path = static/stands/free_software_foundation_europe
--url = https://git.fsfe.org/FSFE/fosdem21-static.git
++      path = static/stands/free_software_foundation_europe
++      url = https://git.fsfe.org/FSFE/fosdem21-static.git
  
  [submodule "content/stands/kiwi_tcms"]
        path = content/stands/kiwi_tcms
@@@ -35,9 -35,9 +35,8 @@@
        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
--
++      path = content/stands/postgresql
++      url = https://git.postgresql.org/git/fosdem2021-content.git
  
  [submodule "static/stands/box86"]
        path = static/stands/box86
@@@ -99,9 -99,3 +98,10 @@@
  [submodule "static/stands/mautic"]
        path = static/stands/mautic
        url = https://github.com/mautic/fosdem-2021-stand-static.git
 +[submodule "content/stands/thola___nesi"]
 +      path = content/stands/thola___nesi
 +      url = https://github.com/inexio/fosdem21-stand-content.git
 +[submodule "static/stands/thola___nesi"]
 +      path = static/stands/thola___nesi
 +      url = https://github.com/inexio/fosdem21-stand-static.git
++