mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-09 03:41:59 +00:00
Conflicts: - filter_dialog.rs: preview_document_for_target keeps our proxy scaling and `p` clone; main's Bitmap rule (the preview drops Output resolution, #5559) is applied to the same `p`. - hu/sr/tr/vi catalogs: both sides appended rows at the end; kept both, no duplicate keys. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>