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
..
2017-09-16 07:52:53 +02:00
2017-09-16 16:58:42 +02:00
2017-09-16 07:52:53 +02:00
2017-09-16 07:52:53 +02:00
2017-09-16 07:52:53 +02:00