Merge branch 'master' into cover_thumbnail

# Conflicts: # cps/editbooks.py # cps/helper.py # cps/web.py # test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
parent 8f665ebd58 8f3bb2e338
commit d9a83e0638
48 changed files with 1053 additions and 1047 deletions
@@ -84,7 +84,7 @@ oauth =
 	Flask-Dance>=2.0.0,<5.2.0
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
-	rarfile>=2.7
+	rarfile>=3.2
 	scholarly>=1.2.0,<1.6
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1