Merge branch 'dev' into feature/Integrate-Azure-Blob

# Conflicts:
#	src/db/migrations/meta/0063_snapshot.json
#	src/db/migrations/meta/_journal.json
This commit is contained in:
Charles GTE
2026-06-20 14:56:41 +02:00
15 changed files with 3220 additions and 11 deletions
+6 -5
View File
@@ -1,6 +1,6 @@
{
"id": "30a01603-826b-4d38-acfe-1689c7d85496",
"prevId": "e6d15bce-96b6-468c-8853-08efe5a18ecd",
"id": "93d81732-8e94-4c2e-be9d-79c7bacc398e",
"prevId": "679bcdd7-cf48-43d5-965d-0814b49196e1",
"version": "7",
"dialect": "postgresql",
"tables": {
@@ -2843,7 +2843,9 @@
"gotify",
"ntfy",
"webhook",
"nextcloud"
"nextcloud",
"teams",
"pushover"
]
},
"public.event_kind": {
@@ -2874,8 +2876,7 @@
"values": [
"local",
"s3",
"google-drive",
"blob"
"google-drive"
]
},
"public.backup_storage_status": {
File diff suppressed because it is too large Load Diff
+9 -2
View File
@@ -446,8 +446,15 @@
{
"idx": 63,
"version": "7",
"when": 1781898343882,
"tag": "0063_steady_randall_flagg",
"when": 1781854323074,
"tag": "0063_open_proudstar",
"breakpoints": true
},
{
"idx": 64,
"version": "7",
"when": 1781960184847,
"tag": "0064_orange_richard_fisk",
"breakpoints": true
}
]