Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.obsidian/workspace.json

.obsidian/plugins/rss-reader/manifest.json

@@ -1,10 +1,10 @@
-{
-	"id": "rss-reader",
-	"name": "RSS Reader",
-	"version": "1.2.2",
-	"minAppVersion": "0.13.33",
-	"description": "Read RSS Feeds from within obsidian",
-	"author": "Johannes Theiner",
-	"authorUrl": "https://github.com/joethei",
-	"isDesktopOnly": false
-}
+{
+	"id": "rss-reader",
+	"name": "RSS Reader",
+	"version": "1.2.2",
+	"minAppVersion": "0.13.33",
+	"description": "Read RSS Feeds from within obsidian",
+	"author": "Johannes Theiner",
+	"authorUrl": "https://github.com/joethei",
+	"isDesktopOnly": false
+}