林檎 2ef4933f7a Merge branch 'feature/download-suffix-20170309' into travis ...

# Conflicts:
#	cps/templates/detail.html

2017-03-09 12:38:55 +08:00

..

static

Merge remote-tracking branch 'Douban/prod'

2017-03-07 20:30:55 +01:00

templates

Merge branch 'feature/download-suffix-20170309' into travis

2017-03-09 12:38:55 +08: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 conflict

2017-03-08 23:56:20 +08:00

fb2.py

Fix except clause

2017-03-06 11:44:54 +08:00

helper.py

Fix Import problem on python2

2017-03-07 21:08:28 +01:00

ub.py

Merge remote-tracking branch 'JackED42/feature/ignorable_columns'

2017-03-07 20:36:43 +01:00

uploader.py

Reuse original code logic.

2017-03-04 15:37:30 +08:00

web.py

Fix #146

2017-03-09 12:32:10 +08:00