Fix merge conflict try 2

Browse Source

...

This commit is contained in:

Bernd Bestel 2020-03-25 20:25:15 +01:00

parent 7fcf3b6eb4

commit 2ab2195b9a

No known key found for this signature in database

GPG Key ID: 71BD34C0D4891300

1 changed files with 1770 additions and 0 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

1770

localization/strings.pot Normal file

View File

File diff suppressed because it is too large Load Diff