1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-01-26 05:27:24 +02:00
Ozzie Isaacs afaf496fbe Merge branch 'master' into cover_thumbnail
# Conflicts:
#	cps/db.py
#	cps/templates/author.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/web.py
#	requirements.txt
#	test/Calibre-Web TestSummary_Linux.html
2022-04-02 11:57:18 +02:00
..
2022-01-26 23:56:10 -06:00
2022-03-13 10:23:13 +01:00
2021-07-30 09:25:19 +02:00
2022-03-13 10:23:13 +01:00
2021-10-03 09:32:29 +02:00
2021-08-07 20:51:10 +08:00
2021-10-03 09:31:24 +02:00
2021-10-06 22:06:33 +02:00
2021-10-06 22:06:33 +02:00