Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		2020-05-17 16:22:58 +02:00
..
css	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
img
js	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico
generic_cover.jpg