Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop ... # Conflicts: # cps/templates/list.html # cps/translations/cs/LC_MESSAGES/messages.po # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fi/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/hu/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.po # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # messages.pot		2020-04-25 20:06:25 +02:00
..
cs/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
de/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
es/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
fi/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
fr/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
hu/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
it/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
ja/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
km/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
nl/LC_MESSAGES	Merge branch 'master' into Develop	2020-04-25 20:06:25 +02:00
pl/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
ru/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
sv/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
tr/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
uk/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00
zh_Hans_CN/LC_MESSAGES	Merge remote-tracking branch 'turkish/master'	2020-04-24 22:14:57 +02:00