Files
pftomandCursor 88824eb46a Merge remote-tracking branch 'origin/main' into glow-seashore
Resolved conflicts in apps/web/src/i18n/content.{ts,fr,ru}.ts by
keeping both branches' EN-fallback additions: the 32 zhangzara
template ids from this branch and 'last30days' from main. Each
side wrote into the same DE/RU/FR fallback array so the conflict
was a pure additive overlap.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-08 11:18:00 +08:00
..
2026-05-06 11:55:59 +08:00