You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
parallel-library/cps
OzzieIsaacs 16cac6ac4f Merge remote-tracking branch 'polish_update/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
8 years ago
..
static Merge remote-tracking branch 'Douban/prod' 8 years ago
templates Merge remote-tracking branch 'polish_update/master' 8 years ago
translations Merge remote-tracking branch 'polish_update/master' 8 years ago
__init__.py custom columns unfinished 9 years ago
book_formats.py Merge branch 'master' into fix/syntax-python3-20170305 8 years ago
db.py Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305' 8 years ago
epub.py Fix except clause 8 years ago
fb2.py Fix except clause 8 years ago
helper.py Fix Import problem on python2 8 years ago
ub.py Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 8 years ago
uploader.py Reuse original code logic. 8 years ago
web.py Merge remote-tracking branch 'polish_update/master' 8 years ago