Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/book_edit.html		2020-05-12 19:10:19 +02:00
..
services
static	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
templates	Merge branch 'master' into Develop	2020-05-12 19:10:19 +02:00
translations
__init__.py	Merge branch 'master' into Develop	2020-05-10 19:24:55 +02:00
about.py
admin.py	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
cache_buster.py
cli.py
comic.py
config_sql.py	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
constants.py
converter.py
db.py	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00
editbooks.py
epub.py
fb2.py
gdrive.py
gdriveutils.py
helper.py	Merge branch 'master' into Develop	2020-05-10 19:24:55 +02:00
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	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
worker.py	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00