Merge remote-tracking branch 'nl/master'

Browse Source

# Conflicts:
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po

...

This commit is contained in:

Ozzieisaacs

2020-03-14 10:45:58 +01:00

parent 20b07e0752 a26ce8d8b5

commit 6643f0d1e0

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

BIN

cps/translations/nl/LC_MESSAGES/messages.mo

Binary file not shown.