Ozzieisaacs 7f34073955 Merge branch 'master' into Develop ... # Conflicts: # cps/web.py # readme.md		2019-02-03 17:33:54 +01:00
..
static
templates	Merge branch 'master' into Develop	2019-02-03 17:33:54 +01:00
translations	Fixes Google Drive	2019-02-03 16:38:27 +01:00
__init__.py
book_formats.py
cache_buster.py
cli.py
comic.py
converter.py
db.py
epub.py
fb2.py
gdriveutils.py	Fixes Google Drive	2019-02-03 16:38:27 +01:00
helper.py	Fixes Google Drive	2019-02-03 16:38:27 +01:00
oauth.py
redirect.py
reverseproxy.py
server.py
ub.py	Merge remote-tracking branch 'oauth/oauth' into Develop	2019-01-27 11:22:22 +01:00
updater.py	Fixes Google Drive	2019-02-03 16:38:27 +01:00
uploader.py
web.py	Merge branch 'master' into Develop	2019-02-03 17:33:54 +01:00
worker.py