Jesse James Isler 23e244ee22 Merge branch 'main' of https://git.james-things.com/James/private_notes
# Conflicts:
#	.obsidian/appearance.json
#	.obsidian/graph.json
#	.obsidian/workspace
2022-06-28 08:07:26 +02:00
..
2022-06-27 16:45:41 +02:00