Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master' ...

# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py

2020-04-05 17:31:41 +02:00

..

services

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

static

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

templates

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

translations

Update Translation

2020-04-03 19:50:29 +02:00

__init__.py

…

about.py

…

admin.py

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

cache_buster.py

…

cli.py

…

comic.py

…

config_sql.py

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

constants.py

…

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_auth.py

…

kobo.py

…

logger.py

…

oauth_bb.py

…

oauth.py

…

opds.py

…

pagination.py

…

redirect.py

…

reverseproxy.py

…

server.py

…

shelf.py

…

subproc_wrapper.py

…

ub.py

…

updater.py

…

uploader.py

…

web.py

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

worker.py

…