Ozzieisaacs 6643f0d1e0 Merge remote-tracking branch 'nl/master' ...

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

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

..

LC_MESSAGES

Merge remote-tracking branch 'nl/master'

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