merging the submodule disaster

Merge branch 'master' of https://git.vvvvvvaria.org/varia/varia.website

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "plugins"]
 	path = plugins
 	url = https://github.com/getpelican/pelican-plugins.git
-[submodule "plugins-custom/events-ics"]
+[submodule "plugins-custom"]
-	path = plugins-custom/events-ics
+	path = plugins-custom
-	url = https://git.vvvvvvaria.org/rra/events-ics.git
+	url = https://git.vvvvvvaria.org/varia/plugins-custom.git
-[submodule "plugins-custom/events_ics"]
-	path = plugins-custom/events_ics
-	url = https://git.vvvvvvaria.org/rra/events_ics.git

README.md

@@ -13,7 +13,7 @@ The folder 'plugins' is linked to the Pelican project '[pelican-plugins](https:/
 We are currently using two submodules:
 
 * plugins ([https://github.com/getpelican/pelican-plugins](https://github.com/getpelican/pelican-plugins))
-* plugins-custom/events-ics ([https://git.vvvvvvaria.org/rra/events-ics](https://git.vvvvvvaria.org/rra/events-ics)) 
+* plugins-custom ([https://git.vvvvvvaria.org/rra/plugins-custom](https://git.vvvvvvaria.org/rra/plugins-custom)) 
 
 To update these submodules within your (already) cloned repository, first init the submodule, and then update it:
 

plugins

@@ -1 +0,0 @@
-Subproject commit 443739890a96125f4cfa796972a7b53119df89ff

plugins-custom/events_ics

@@ -1 +0,0 @@
-Subproject commit 539841521a88d012cc49dc165aa3f5b5efbf8b65