Ozzie Isaacs 4b7a0f3662 Merge branch 'master' into Develop ... # Conflicts: # cps/opds.py # cps/server.py # cps/web.py		2023-02-05 12:10:01 +01:00
..
fonts
images
img
libs	Update pdf Reader	2022-09-05 19:42:02 +02:00
caliBlur.css	Merge remote-tracking branch 'caliblur/issue/2515'	2022-12-25 11:04:14 +01:00
caliBlur_override.css	fixes #2515	2022-10-21 15:08:33 +02:00
epub_themes.css
kthoom.css
listen.css
main.css
popup.css
reader.css	Merge remote-tracking branch 'font_size/issue/487'	2022-12-25 10:29:29 +01:00
style.css	Merge branch 'master' into Develop	2023-02-05 12:10:01 +01:00
text.css
upload.css