Merge branch 'master' into Develop

# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
This commit is contained in:
Ozzieisaacs
2020-01-26 19:29:36 +01:00
13 changed files with 361 additions and 373 deletions

View File

@ -125,7 +125,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.5 Beta'}
STABLE_VERSION = {'version': '0.6.6 Beta'}
NIGHTLY_VERSION = {}
NIGHTLY_VERSION[0] = '$Format:%H$'