Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop ... # Conflicts: # cps/config_sql.py # cps/ub.py # cps/web.py		2020-04-16 20:12:27 +02:00
..
css	Merge remote-tracking branch 'origin/master'	2020-04-05 19:10:27 +02:00
img
js	Merge branch 'master' into Develop	2020-04-16 20:12:27 +02:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico
generic_cover.jpg