Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master' ... # Conflicts: # cps/admin.py # cps/templates/admin.html # cps/templates/config_edit.html # cps/web.py		2020-04-05 17:31:41 +02:00
..
css	Merge branch 'master' into Develop	2020-02-17 18:42:53 +01:00
img
js	Merge remote-tracking branch 'ldap/master'	2020-04-05 17:31:41 +02:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico
generic_cover.jpg