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
parent a2b886b0be f2de1d4c47
commit 12db39523c
252 changed files with 87040 additions and 180 deletions
@@ -22,4 +22,4 @@ if config.DEVELOPMENT:
 else:
    http_server = HTTPServer(WSGIContainer(web.app))
    http_server.listen(config.PORT)
-    IOLoop.instance().start()
+    IOLoop.instance().start()