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-20 21:13:32 +02:00
2016-04-20 19:25:47 +02:00
2017-09-17 07:15:08 +02:00
2017-07-23 13:35:35 -07:00
2017-03-29 21:43:55 +02:00
2017-09-17 10:54:23 +02:00
2017-09-16 19:57:00 +02:00
2017-07-13 21:28:00 -07:00
2017-08-23 08:55:40 -07:00
2017-03-04 15:37:30 +08:00
2017-09-17 15:33:22 +02:00