mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-24 09:57:08 -06:00
The branch was 1134 commits behind main. Every conflict was two sides adding to the same list: File > Open extensions (web and desktop), the automation path checks and their tests, the command registry, `psd` modules, the preset file opener (main added `.pat`), the i18n tables (main's new strings kept, the Styles panel strings appended), and the parity/gaps status lines (`.asl` now R/W, dated 2026-10-20). Co-authored-by: Brandon Thomas <39263+echelon@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>