Jack Darlington cf1ca21bbc Merge branch 'master' into develop ... # Conflicts: # cps/db.py # cps/ub.py # cps/web.py # readme.md # requirements.txt		2017-03-07 22:03:10 +00:00
..
static	Merge remote-tracking branch 'Douban/prod'	2017-03-07 20:30:55 +01:00
templates	Merge branch 'master' into develop	2017-03-07 22:03:10 +00:00
translations	Merge branch 'janeczku-master'	2017-03-07 09:01:56 +08:00
__init__.py
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 except clause	2017-03-06 11:44:54 +08:00
fb2.py	Fix except clause	2017-03-06 11:44:54 +08:00
gdriveutils.py
helper.py	Merge branch 'master' into develop	2017-03-07 22:03:10 +00:00
ub.py	Merge branch 'master' into develop	2017-03-07 22:03:10 +00:00
uploader.py
web.py	Merge branch 'master' into develop	2017-03-07 22:03:10 +00:00