Jack Darlington 06a4af44cc Merge branch 'master' into develop ... # Conflicts: # cps/web.py		2017-03-16 21:02:11 +00:00
..
static	added jquery.form.js to project locally	2017-03-12 21:20:09 +00:00
templates	Merge branch 'master' into develop	2017-03-16 21:02:11 +00:00
translations	Merge remote-tracking branch 'polish_update/master'	2017-03-12 19:12:17 +01:00
__init__.py	custom columns unfinished	2016-04-20 19:25:47 +02:00
book_formats.py	Merge branch 'master' into fix/syntax-python3-20170305	2017-03-07 14:06:29 +08:00
db.py	Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'	2017-03-07 20:22:28 +01:00
epub.py	fix conflict	2017-03-08 23:56:20 +08:00
fb2.py	Fix except clause	2017-03-06 11:44:54 +08:00
gdriveutils.py	Fix for editing book cover with drive + fixed found bug that has_cover not set	2017-03-08 00:26:15 +00:00
helper.py	Fix for updater	2017-03-13 00:44:20 +00:00
ub.py	Merge branch 'develop' into personal	2017-03-07 22:05:56 +00:00
uploader.py	Reuse original code logic.	2017-03-04 15:37:30 +08:00
web.py	Merge branch 'master' into develop	2017-03-16 21:02:11 +00:00