Ozzie Isaacs e10a8c078b Merge branch 'master' into development ... # Conflicts: # cps/templates/email_edit.html		2021-03-27 18:36:11 +01:00
..
services
static
tasks
templates	Merge branch 'master' into development	2021-03-27 18:36:11 +01:00
translations
__init__.py	Fix wording and tabs	2021-03-27 17:30:54 +01:00
about.py
admin.py
cache_buster.py
cli.py
comic.py
config_sql.py
constants.py
converter.py
db.py
debug_info.py
editbooks.py
epub.py
error_handler.py
fb2.py
gdrive.py
gdriveutils.py
gmail.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
remotelogin.py
render_template.py
reverseproxy.py
server.py
shelf.py
subproc_wrapper.py
ub.py
updater.py
uploader.py
usermanagement.py
web.py