Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py		2020-05-10 19:24:55 +02:00
..
css	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	2020-05-01 17:25:13 +02:00
img
js	Merge branch 'master' into Develop	2020-05-10 19:24:55 +02:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico
generic_cover.jpg