Merge branch 'master' into Develop

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2020-09-27 08:54:32 +02:00
parent 8f9de05768 6108ef4c89
commit 861f1b2ca3
35 changed files with 2865 additions and 2798 deletions
@@ -128,7 +128,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                  'series_id, languages')

-STABLE_VERSION = {'version': '0.6.9 Beta'}
+STABLE_VERSION = {'version': '0.6.10 Beta'}

 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'