Merge branch 'master' into development
# Conflicts: # cps/server.py # test/Calibre-Web TestSummary_Linux.html
Showing
This diff is collapsed.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
43 Bytes
This diff is collapsed.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
43 Bytes
12.9 KB
15.8 KB
cps/templates/readdjvu.html
0 → 100644