mirror of
https://github.com/storytold/lightcraft.git
synced 2026-11-01 14:07:34 -06:00
Conflicts: docs/whats-new.md and docs/parity-checklist.md (both sides unioned), locales/ru.json (both keys kept)
Conflicts: docs/whats-new.md and docs/parity-checklist.md (both sides unioned), locales/ru.json (both keys kept)