OzzieIsaacs acac0570e5 Merge remote-tracking branch 'use_pip/use-pip' ...

# Conflicts:
#	cps.py
#	readme.md
#	vendor/wand/api.py
#	vendor/wand/drawing.py
#	vendor/wand/exceptions.py
#	vendor/wand/image.py
#	vendor/wand/version.py

2017-03-07 19:46:23 +01:00

..

static

…

templates

…

translations

…

__init__.py

…

book_formats.py

…

db.py

…

epub.py

…

fb2.py

…

helper.py

…

ub.py

…

uploader.py

…

web.py

Merge remote-tracking branch 'use_pip/use-pip'

2017-03-07 19:46:23 +01:00