Merge branch 'Develop'
# Conflicts: # cps/__init__.py
Showing
cps/__init__.py
100755 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/server.py
100755 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
test/Calibre-Web TestSummary.html
100755 → 100644
This diff is collapsed.
Please
register
or
sign in
to comment