Ozzie Isaacs f62d6abb69 Merge branch 'master' into development ... # Conflicts: # cps/server.py # test/Calibre-Web TestSummary_Linux.html		2021-03-15 13:53:23 +01:00
..
css	Merge remote-tracking branch 'cliblur/master' into development	2021-03-15 08:21:44 +01:00
img	Update bootstrap table to 1.18.2	2021-02-20 20:03:39 +01:00
js	Merge branch 'master' into development	2021-03-15 13:53:23 +01:00
locale	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
favicon.ico	Favicon replaced (#424) with hiher resolution	2018-01-06 11:36:23 +01:00
generic_cover.jpg	Improvement for #1721 (shrinked generic cover)	2020-11-22 08:28:52 +01:00