From: Pieter De Praetere Date: Mon, 25 Jan 2021 19:33:52 +0000 (+0100) Subject: Merge branch 'master' of git://github.com/GNOME/stands-website into GNOME-master X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e25dac0281d8a85df915b4b613a5decc2d4b734d;p=stands-website.git Merge branch 'master' of git://github.com/GNOME/stands-website into GNOME-master --- e25dac0281d8a85df915b4b613a5decc2d4b734d diff --cc .gitmodules index 16de47e,17a410f..2491f18 --- a/.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 ++