Commit Graph

4 Commits (bbf6d9b026c78a2e2a788c46a43a1be583f2c167)

Author SHA1 Message Date
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
8 years ago
OzzieIsaacs cd792d0ca7 Import files are now searched first from vendor folder and not from python folder
This should solve issues if different versions of packages are installed on the machine (like in #61)
8 years ago
wuqi b846cc11d8 fix some error
Fix TypeError: 'bool' object is not callable
9 years ago
janeczku 727a49db6f Add gitignore, config.ini.example 9 years ago