Merge branch 'master' into cover_thumbnail

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2022-04-20 07:25:37 +02:00
parent 2f3e5eadeb 2303fc0814
commit 3c98cd1b9a
63 changed files with 13803 additions and 12890 deletions
@@ -42,7 +42,7 @@ install_requires =
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
-	Flask-Login>=0.3.2,<0.5.1
+	Flask-Login>=0.3.2,<0.6.1
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0