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
|
ab97ead264
|
merge test
|
8 years ago |
|
janeczku
|
d0c9bf9e0e
|
Add shebang
Closes #29
|
8 years ago |
|
janeczku
|
f7e868044e
|
Move vendored libraries to vendor directory
|
9 years ago |
|
Jan Broer
|
64a9cbce2d
|
Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/
|
9 years ago |