OzzieIsaacs 12db39523c Merge branch 'master' of https://github.com/wuqi/calibre-web ... # Conflicts: # .gitignore # cps/static/css/colors.css # cps/static/css/style.css # cps/web.py		2016-10-24 19:04:16 +02:00
..
blinker	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
flask	Add txt reader	2016-07-16 16:44:47 +08:00
jinja2	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
markupsafe	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
PyPDF2	Add PyPDF2 to vendor	2016-08-07 22:12:32 +02:00
requests	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
sqlalchemy	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
sqlalchemy_fulltext	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
tornado	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
wand	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
werkzeug	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
configobj.py	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
flask_login.py	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
flask_principal.py	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00
itsdangerous.py	Move vendored libraries to vendor directory	2016-04-27 17:47:31 +02:00