Ozzieisaacs 861f1b2ca3 Merge branch 'master' into Develop ... # Conflicts: # test/Calibre-Web TestSummary_Linux.html		2020-09-27 08:54:32 +02:00
..
services
static	Merge branch 'master' into Develop	2020-09-27 08:54:32 +02:00
tasks
templates
translations
__init__.py
about.py
admin.py
cache_buster.py
cli.py
comic.py
config_sql.py
constants.py	Merge branch 'master' into Develop	2020-09-27 08:54:32 +02:00
converter.py
db.py
editbooks.py
epub.py
fb2.py
gdrive.py
gdriveutils.py
helper.py
iso_language_names.py
isoLanguages.py
jinjia.py
kobo.py
kobo_auth.py
logger.py
oauth.py
oauth_bb.py
opds.py
pagination.py
redirect.py
reverseproxy.py
server.py
shelf.py
subproc_wrapper.py
ub.py
updater.py
uploader.py
web.py