Commit Graph

7 Commits

Author SHA1 Message Date
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
abe4be29f4 vault auto-backup: 24.06.2022 - 15:45:35
Affected files:
.gitignore
.obsidian/app.json
.obsidian/workspace
Firmen/steinemann technology/Auswertungen K2H.md
Firmen/steinemann technology/Penta/img/läuft.jpg
Firmen/steinemann technology/Penta/img/parametererstellung.jpg
Firmen/steinemann technology/Penta/img/subreportlinks.jpg
Firmen/steinemann technology/Penta/img/tables.jpg
Firmen/steinemann technology/Penta/img/teilefamilie.jpg
Firmen/steinemann technology/Penta/img/ustfix_Command-PUID.jpg
Firmen/steinemann technology/Penta/img/ustfix_PKRK-PUID.jpg
Firmen/steinemann technology/Penta/img/ustfix_command.jpg
Firmen/steinemann technology/Penta/img/verknüpfungenPkrkPZBF.jpg
Firmen/steinemann technology/Penta/toimprove.md
Firmen/steinemann technology/Penta/Änderungen.md
Firmen/steinemann technology/infomails/Monitorausgabe.md
README.md
attachment/DELETEME.md
2022-06-24 15:45:36 +02:00
c2ad1c6e54 updated 2022-06-24 15:33:53 +02:00
c2d1405bfe vault auto-backup: 24.06.2022 - 15:32:15
Affected files:
.gitattributes
.gitignore
.obsidian/app.json
.obsidian/appearance.json
.obsidian/community-plugins.json
.obsidian/core-plugins.json
.obsidian/hotkeys.json
.obsidian/page-preview.json
.obsidian/plugins/obsidian-git/data.json
.obsidian/plugins/obsidian-git/main.js
.obsidian/plugins/obsidian-git/manifest.json
.obsidian/plugins/obsidian-git/styles.css
.obsidian/plugins/obsidian-image-toolkit/data.json
.obsidian/plugins/obsidian-image-toolkit/main.js
.obsidian/plugins/obsidian-image-toolkit/manifest.json
.obsidian/plugins/obsidian-image-toolkit/styles.css
.obsidian/plugins/table-editor-obsidian/data.json
.obsidian/plugins/table-editor-obsidian/main.js
.obsidian/plugins/table-editor-obsidian/manifest.json
.obsidian/plugins/table-editor-obsidian/styles.css
Firmen/Bewerbungen/bewerbung 22/firm/acs.md
Firmen/Bewerbungen/bewerbung 22/firm/bilfinger.md
Firmen/Bewerbungen/bewerbung 22/firm/fronius.md
Firmen/Bewerbungen/bewerbung 22/firm/hofer.md
Firmen/Bewerbungen/bewerbung 22/firm/world4you.md
Firmen/steinemann technology/Auswertungen K2H.md
Firmen/steinemann technology/K2H/Vorfall Abgeschlossen.html
Firmen/steinemann technology/Monitore.md
Firmen/steinemann technology/Penta/img/läuft.jpg
Firmen/steinemann technology/Penta/img/parametererstellung.jpg
Firmen/steinemann technology/Penta/img/subreportlinks.jpg
Firmen/steinemann technology/Penta/img/tables.jpg
Firmen/steinemann technology/Penta/img/teilefamilie.jpg
Firmen/steinemann technology/Penta/img/ustfix_Command-PUID.jpg
Firmen/steinemann technology/Penta/img/ustfix_PKRK-PUID.jpg
Firmen/steinemann technology/Penta/img/ustfix_command.jpg
Firmen/steinemann technology/Penta/img/verknüpfungenPkrkPZBF.jpg
Firmen/steinemann technology/Penta/toimprove.md
Firmen/steinemann technology/Penta/Änderungen.md
Firmen/steinemann technology/Vimbackup restore.md
Firmen/steinemann technology/adobe.md
Firmen/steinemann technology/aufsetzen der ABPs.md
Firmen/steinemann technology/ausleihe.md
Firmen/steinemann technology/fragen für keeper.md
Firmen/steinemann technology/img/keeper_konto.jpg
Firmen/steinemann technology/img/monitre.jpg
Firmen/steinemann technology/img/sso.jpg
Firmen/steinemann technology/infomails/Achtung Phish!.md
Firmen/steinemann technology/infomails/Monitorausgabe.md
Firmen/steinemann technology/infomails/img/fake.png
Firmen/steinemann technology/infomails/img/fakeinvite.png
Firmen/steinemann technology/todo.html
Firmen/steinemann technology/todo.md
README.md
attachment/DELETEME.md
2022-06-24 15:32:15 +02:00
e100503096 updated gitignore 2022-06-22 23:00:40 +02:00
bbac065571 darn workspace 2022-06-22 10:09:53 +02:00
84e485f5b4 updated 2022-06-22 10:09:28 +02:00