Ozzie Isaacs 302679719d Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/converter.py # cps/subproc_wrapper.py # test/Calibre-Web TestSummary_Linux.html		2021-07-30 16:33:06 +02:00
..
css	fix #2014 (User menu dropdown in caliblur is tiny and presents scrollbars)	2021-07-11 13:15:13 +02:00
img	Added google scholar as metadata provider	2021-05-16 13:24:42 +02:00
js	Merge branch 'master' into Develop	2021-07-30 16:33:06 +02:00
locale	Updated pdf reader	2021-03-25 18:57:40 +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