resolve merge conflicts

Browse Source

...

This commit is contained in:

ansuz

2019-02-12 11:58:13 +01:00

parent 905e6b0fa1 2b33d9ecee

commit f1d1818200

3 changed files with 596 additions and 594 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

1165

www/common/translations/old/messages.de.js

File diff suppressed because it is too large Load Diff