user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	.gitignore
#	cps/web.py
This commit is contained in:
Jack Darlington
2017-03-06 19:17:00 +00:00
parent 27cbab6cb7 789a1af68f
commit fabfcb2036
10 changed files with 15539 additions and 23186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -25,4 +25,7 @@ cps/static/[0-9]*
tags
settings.yaml
gdrive_credentials
gdrive_credentials
#kindlegen
vendor/kindlegen