mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-28 13:57:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Develop'

Browse Source 
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
This commit is contained in:
Ozzieisaacs
2020-02-23 13:15:30 +01:00
parent 3b8c5ef21a 134a10f56c
commit 146068c936
26 changed files with 4726 additions and 2495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cps/about.py
View File

@@ -70,7 +70,7 @@ _VERSIONS = OrderedDict(
Unidecode = unidecode_version,
Flask_SimpleLDAP = u'installed' if bool(services.ldap) else u'not installed',
Goodreads = u'installed' if bool(services.goodreads_support) else u'not installed',
jsonschema = services.SyncToken.__version__ if bool(services.SyncToken) else u'not installed',
)
_VERSIONS.update(uploader.get_versions())