Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/readpdf.html # cps/translations/uk/LC_MESSAGES/messages.po # cps/web.py		2019-04-13 16:42:09 +02:00
..
de/LC_MESSAGES
es/LC_MESSAGES
fr/LC_MESSAGES
hu/LC_MESSAGES
it/LC_MESSAGES
ja/LC_MESSAGES
km/LC_MESSAGES
nl/LC_MESSAGES
pl/LC_MESSAGES
ru/LC_MESSAGES
sv/LC_MESSAGES
uk/LC_MESSAGES	Merge branch 'master' into Develop	2019-04-13 16:42:09 +02:00
zh_Hans_CN/LC_MESSAGES
iso639.pickle