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
img
js	Merge branch 'master' into development	2021-03-15 13:53:23 +01:00
locale
favicon.ico
generic_cover.jpg