Merge branch 'feature/media-library-screen' into feature/media-library-phase2

# Conflicts:
#	frontend/src/i18n/locales/en/translation.json
#	frontend/src/i18n/locales/nl/translation.json
This commit is contained in:
2026-11-17 22:15:38 +01:00
4 changed files with 2 additions and 4 deletions
@@ -709,7 +709,6 @@
"tall": "Portrait preview"
},
"apply": "Apply",
"applyHint": "The change only takes effect when you save the hero. If you leave the page without saving it is dropped.",
"previewPending": "The preview of this photo is being prepared. Close this window and try again in a few seconds.",
"reset": "Use the photo’s crop again"
},