OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any' ...

# Conflicts:
#	cps/web.py

2018-08-31 15:00:22 +02:00

..

admin.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00

author.html

…

book_edit.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00

config_edit.html

Merge remote-tracking branch 'Comic/comic_server'

2018-08-31 10:47:58 +02:00

config_view_edit.html

…

detail.html

…

discover.html

…

email_edit.html

…

feed.xml

…

fragment.html

…

index.html

…

index.xml

…

json.txt

…

languages.html

Merge remote-tracking branch 'Comic/comic_server'

2018-08-31 10:47:58 +02:00

layout.html

…

list.html

…

login.html

…

osd.xml

…

read.html

…

readcbr.html

Merge remote-tracking branch 'Comic/comic_server'

2018-08-31 10:47:58 +02:00

readpdf.html

…

readtxt.html

…

register.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00

remote_login.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00

search_form.html

…

search.html

…

shelf_edit.html

…

shelf_order.html

…

shelf.html

…

stats.html

…

tasks.html

…

user_edit.html

Merge remote-tracking branch 'Convert_all/ebookconvert-any'

2018-08-31 15:00:22 +02:00