Merge branch 'master' into Develop

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2023-02-06 19:02:47 +01:00
parent fb42f6bfff 14d14637cd
commit 7a4e6fbdfb
53 changed files with 901 additions and 915 deletions
@@ -45,7 +45,7 @@ install_requires =
 	Flask-Login>=0.3.2,<0.6.3
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
-	Flask>=1.0.2,<2.2.0
+	Flask>=1.0.2,<2.3.0
 	iso-639>=0.4.5,<0.5.0
 	PyPDF>=3.0.0,<3.3.0
 	pytz>=2016.10