Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop ... # Conflicts: # cps/book_formats.py # cps/static/css/style.css # cps/static/js/uploadprogress.js # cps/templates/author.html # cps/templates/detail.html # cps/templates/discover.html # cps/templates/index.html # cps/templates/layout.html # cps/templates/osd.xml # cps/templates/search.html # cps/templates/shelf.html # cps/translations/de/LC_MESSAGES/messages.mo # cps/translations/de/LC_MESSAGES/messages.po # cps/web.py # messages.pot		2019-03-10 08:31:10 +01:00
..
admin.html	Code cosmetics	2019-03-05 17:34:51 +01:00
author.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
book_edit.html	Add scrollbar to metadata load screen	2019-03-01 21:00:09 +01:00
config_edit.html	Fix for sqlalchemy 1.3	2019-03-08 16:29:12 +01:00
config_view_edit.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
detail.html	Fix #766	2019-02-24 19:23:51 +01:00
discover.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
email_edit.html
feed.xml
fragment.html
http_error.html
index.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
index.xml
json.txt
languages.html
layout.html	Fix uncompressed cbz files	2019-03-05 20:59:30 +01:00
list.html	Fix for sqlalchemy 1.3	2019-03-08 16:29:12 +01:00
listenmp3.html
login.html
osd.xml	Fix for #830	2019-03-03 08:41:50 +01:00
read.html
readcbr.html
readpdf.html
readtxt.html
register.html
remote_login.html
search.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
search_form.html
shelf.html	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
shelf_edit.html
shelf_order.html
shelfdown.html
stats.html
tasks.html
user_edit.html	Code cosmetics	2019-03-05 17:34:51 +01:00