diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-20 06:06:56 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-20 06:06:56 +0200 |
| commit | a4b2f5dc0a08c23ce615e80cebdbec6f3b20f688 (patch) | |
| tree | 46568bc10980f94770da28b53d03bb866b3f018a /res/lang | |
| parent | 7c08d8c02cf03bcc3036d7d47547cd5bb273fa85 (diff) | |
| parent | d60741bf51d9742e6d0f57835fbc36f726f8e4f1 (diff) | |
Merge branch 'dev' into work/v1.11
# Conflicts:
# res/lang/cs.bin
# res/lang/es.bin
# res/lang/ru.bin
# res/lang/sr.bin
# res/lang/tr.bin
# res/lang/uk.bin
Diffstat (limited to 'res/lang')
0 files changed, 0 insertions, 0 deletions