Ozzie Isaacs 2e815147fb Merge branch 'master' into Develop ...

# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html

2021-12-19 10:29:56 +01:00

..

metadata_provider

…

services

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

static

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

tasks

Bugfix handling of stacktrace from calibre

2021-12-18 18:38:17 +01:00

templates

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

translations

…

__init__.py

…

about.py

…

admin.py

…

cache_buster.py

…

cli.py

…

comic.py

…

config_sql.py

…

constants.py

…

converter.py

…

db.py

…

debug_info.py

…

dep_check.py

…

editbooks.py

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

epub.py

…

error_handler.py

…

fb2.py

…

gdrive.py

…

gdriveutils.py

…

helper.py

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

iso_language_names.py

…

isoLanguages.py

…

jinjia.py

…

kobo_auth.py

…

kobo_sync_status.py

…

kobo.py

Merge branch 'master' into Develop

2021-12-19 10:29:56 +01:00

logger.py

…

MyLoginManager.py

…

oauth_bb.py

…

oauth.py

…

opds.py

…

pagination.py

…

redirect.py

…

remotelogin.py

…

render_template.py

…

reverseproxy.py

…

search_metadata.py

…

server.py

…

shelf.py

…

subproc_wrapper.py

…

ub.py

…

updater.py

…

uploader.py

…

usermanagement.py

…

web.py

…