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

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00

translations

Merge remote-tracking branch 'it/patch-15' into master

2020-09-26 16:19:34 +02:00

__init__.py

…

about.py

…

admin.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

cache_buster.py

…

cli.py

…

comic.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

config_sql.py

…

constants.py

Merge branch 'master' into Develop

2020-09-27 08:54:32 +02:00

converter.py

…

db.py

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00

editbooks.py

Fix error from merge

2020-09-26 09:42:40 +02:00

epub.py

…

fb2.py

…

gdrive.py

…

gdriveutils.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

helper.py

…

iso_language_names.py

…

isoLanguages.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

jinjia.py

…

kobo_auth.py

…

kobo.py

…

logger.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

oauth_bb.py

…

oauth.py

…

opds.py

…

pagination.py

…

redirect.py

…

reverseproxy.py

…

server.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

shelf.py

…

subproc_wrapper.py

…

ub.py

…

updater.py

…

uploader.py

…

web.py

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00