Merge branch 'master' of https://github.com/TomAndJerry14/Daily

# Conflicts:
#	.obsidian/workspace.json

.obsidian/plugins/obsidian-version-history-diff/data.json

@@ -0,0 +1,5 @@
+{
+  "diffStyle": "word",
+  "matchWordsThreshold": 0.25,
+  "colorBlind": true
+}

.obsidian/plugins/obsidian-version-history-diff/manifest.json

@@ -0,0 +1,10 @@
+{
+	"id": "obsidian-version-history-diff",
+	"name": "Version History Diff",
+	"version": "2.1.0",
+	"minAppVersion": "1.1.7",
+	"description": "Diff the version history of the core Sync and File Recovery plugins and Git. Adds a command to open the core Sync version history as well.",
+	"author": "kometenstaub",
+	"authorUrl": "https://github.com/kometenstaub",
+	"isDesktopOnly": false
+}