Merge branch 'master' into cover_thumbnail

# Conflicts:
#	cps/editbooks.py
#	test/Calibre-Web TestSummary_Linux.html
This commit is contained in:
Ozzie Isaacs
2022-03-20 17:15:40 +01:00
14 changed files with 242 additions and 227 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
APScheduler>=3.6.3,<3.8.0
APScheduler>=3.6.3,<3.10.0
Babel>=1.3,<3.0
Flask-Babel>=0.11.1,<2.1.0
Flask-Login>=0.3.2,<0.5.1