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

main

msquare 8 years ago

parent 16ed2ae683 852f17a535

commit 3873b8dc61

1 changed files with 1827 additions and 262 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

2089

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

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save