OzzieIsaacs 299cf82921 Merge remote-tracking branch 'translation/master' ... # Conflicts: # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po		2017-09-22 20:56:36 +02:00
..
messages.mo	Merge remote-tracking branch 'translation/master'	2017-09-22 20:56:36 +02:00
messages.po	Merge remote-tracking branch 'translation/master'	2017-09-22 20:56:36 +02:00