OzzieIsaacs 16cac6ac4f Merge remote-tracking branch 'polish_update/master' ... # Conflicts: # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po Fix for #147		2017-03-12 19:12:17 +01:00
..
de/LC_MESSAGES	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00
es/LC_MESSAGES	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00
fr/LC_MESSAGES	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00
pl/LC_MESSAGES	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00
zh_Hans_CN/LC_MESSAGES	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00