James@STCH cc17cf287c Merge branch 'main' of https://git.james-things.com/DNDs/talon-one ... # Conflicts: # .gitattributes # .gitignore # .obsidian/app.json # .obsidian/appearance.json # .obsidian/community-plugins.json # .obsidian/core-plugins.json # .obsidian/graph.json # .obsidian/hotkeys.json # .obsidian/plugins/obsidian-git/data.json # .obsidian/plugins/obsidian-image-toolkit/data.json # .obsidian/plugins/table-editor-obsidian/data.json		2022-07-12 12:37:33 +02:00
..
plugins	Merge branch 'main' of https://git.james-things.com/DNDs/talon-one	2022-07-12 12:37:33 +02:00
themes	vault auto-backup: 12.07.2022 - 10:35:18	2022-07-12 10:35:18 +02:00
app.json	vault auto-backup: 12.07.2022 - 10:35:18	2022-07-12 10:35:18 +02:00
appearance.json	vault auto-backup: 12.07.2022 - 10:35:18	2022-07-12 10:35:18 +02:00
command-palette.json	vault auto-backup: 04.07.2022 - 14:08:55	2022-07-04 14:08:55 +02:00
community-plugins.json	Added plugins	2022-07-12 10:42:24 +02:00
core-plugins.json	vault auto-backup: 04.07.2022 - 14:08:55	2022-07-04 14:08:55 +02:00
daily-notes.json	vault auto-backup: 30.06.2022 - 09:24:29	2022-06-30 09:24:29 +02:00
graph.json	Merge branch 'main' of https://git.james-things.com/DNDs/talon-one	2022-07-12 12:37:33 +02:00
hotkeys.json	vault backup: 05.07.2022 - 13:22:45	2022-07-05 13:22:45 +02:00
page-preview.json	vault auto-backup: 24.06.2022 - 15:32:15	2022-06-24 15:32:15 +02:00
starred.json	vault auto-backup: 04.07.2022 - 14:43:56	2022-07-04 14:43:56 +02:00
templates.json	vault auto-backup: 30.06.2022 - 10:03:15	2022-06-30 10:03:15 +02:00
workspace	Affected files:	2022-07-12 12:23:01 +02:00