林檎 7bae79d826 fix conflict		2017-03-08 23:56:20 +08:00
..
static	Merge remote-tracking branch 'Douban/prod'	2017-03-07 20:30:55 +01:00
templates	fix conflict	2017-03-08 23:56:20 +08:00
translations	Merge branch 'janeczku-master'	2017-03-07 09:01:56 +08: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
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	merge conflict	2017-03-08 23:52:41 +08:00