Jack Darlington 82d01c9001 Merge branch 'master' into develop ... # Conflicts: # cps/web.py		2017-02-22 22:45:19 +00:00
..
static	Navbar reduced to icons on smaller screens	2017-02-20 19:52:00 +01:00
templates	Merge branch 'master' into develop	2017-02-22 22:45:19 +00:00
translations	Navbar reduced to icons on smaller screens	2017-02-20 19:52:00 +01:00
__init__.py
book_formats.py
db.py	Merge branch 'master' into develop	2017-02-22 22:45:19 +00:00
epub.py
fb2.py
gdriveutils.py	GitIgnore update + fixes for initial setup	2017-02-22 22:06:59 +00:00
helper.py	Bugfix Updater	2017-02-21 19:40:22 +01:00
ub.py	GitIgnore update + fixes for initial setup	2017-02-22 22:06:59 +00:00
uploader.py
web.py	Merge branch 'master' into develop	2017-02-22 22:45:19 +00:00