fix conflict

Browse Source

...

This commit is contained in:

camellan

2019-06-26 01:27:43 +04:00

parent f866df7964

commit 775c4a23f0

2 changed files with 42 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

locale/ru/LC_MESSAGES/strings.mo

Binary file not shown.