Merge branch 'pr/276'

Browse Source

# Conflicts:
#	locale/de_DE.UTF-8/LC_MESSAGES/default.mo
#	locale/de_DE.UTF-8/LC_MESSAGES/default.po

...

This commit is contained in:

msquare 2016-11-15 15:35:55 +01:00

parent 16ed2ae683 852f17a535

commit 3873b8dc61

1 changed files with 1791 additions and 226 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

2017

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

View File

File diff suppressed because it is too large Load Diff