fix fucked up merge

Browse Source

...

This commit is contained in:

msquare 2016-11-15 15:49:39 +01:00

parent 3873b8dc61

commit 19d5d68d82

2 changed files with 510 additions and 2076 deletions

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

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

BIN

locale/de_DE.UTF-8/LC_MESSAGES/default.mo

View File

Binary file not shown.

2586

locale/de_DE.UTF-8/LC_MESSAGES/default.po

View File

File diff suppressed because it is too large Load Diff