Skip to content

Commit d6b970c

Browse files
nichu42Copilot
andcommitted
Merge remote-tracking branch 'origin/main' into main
Keep POEditor German translations (latest exported values-de/strings.xml) and resolve conflict with local localization changes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents 64a0e95 + bd69663 commit d6b970c

1 file changed

Lines changed: 522 additions & 2 deletions

File tree

0 commit comments

Comments
 (0)