You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ozzie Isaacs f62d6abb69 Merge branch 'master' into development ... # Conflicts: # cps/server.py # test/Calibre-Web TestSummary_Linux.html		4 years ago
..
css	Merge remote-tracking branch 'cliblur/master' into development	4 years ago
img	Update bootstrap table to 1.18.2	4 years ago
js	Merge branch 'master' into development	4 years ago
locale	Updated pdf viewer to 2.2.228 (#1184)	5 years ago
favicon.ico	Favicon replaced (#424) with hiher resolution	7 years ago
generic_cover.jpg	Improvement for #1721 (shrinked generic cover)	4 years ago