Ozzieisaacs b160a8de0b Merge branch 'master' into Develop ... # Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py		2020-04-30 18:08:28 +02:00
..
admin.html
author.html
book_edit.html
book_exists_flash.html
config_edit.html	Renabled cbrimage extraction (via unrar and rarfile)	2020-04-28 16:50:08 +02:00
config_view_edit.html
detail.html	Bugfix view shelfs on book detail page	2020-04-26 11:35:47 +02:00
discover.html
email_edit.html
feed.xml	Merge remote-tracking branch 'opds/master'	2020-04-26 18:55:23 +02:00
fragment.html
generate_kobo_auth_url.html
http_error.html
index.html
index.xml
json.txt
languages.html
layout.html
list.html
listenmp3.html
login.html
logviewer.html
modal_restriction.html
osd.xml
read.html
readcbr.html
readpdf.html
readtxt.html
register.html
remote_login.html
search.html	Removed non working filters for search	2020-04-29 17:57:53 +02:00
search_form.html
shelf.html
shelf_edit.html
shelf_order.html
shelfdown.html
stats.html
tasks.html
user_edit.html