Ozzieisaacs b160a8de0b Merge branch 'master' into Develop ... # Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py		2020-04-30 18:08:28 +02:00
..
css	Code cosmetics	2020-04-27 20:22:55 +02:00
img
js	Merge branch 'master' into Develop	2020-04-30 18:08:28 +02:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico
generic_cover.jpg