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
..
LC_MESSAGES	Merge branch 'master' into Develop	2019-04-13 16:42:09 +02:00