Jack Darlington 06a4af44cc Merge branch 'master' into develop ... # Conflicts: # cps/web.py		2017-03-16 21:02:11 +00:00
..
admin.html	Added editing star rating graphically	2017-03-07 19:10:17 +01:00
book_edit.html	Merge remote-tracking branch 'kennyl/travis'	2017-03-12 21:13:25 +01:00
config_edit.html	Updated use google drive checkbox	2017-03-12 21:03:01 +00:00
detail.html	Merge branch 'master' into develop	2017-03-16 21:02:11 +00:00
discover.html
email_edit.html
feed.xml	Added editing star rating graphically	2017-03-07 19:10:17 +01:00
index.html	Added editing star rating graphically	2017-03-07 19:10:17 +01:00
index.xml
json.txt
languages.html	Make better usage of big screens in lists	2017-02-25 13:28:57 +01:00
layout.html	Merge branch 'master' into develop	2017-02-22 22:45:19 +00:00
list.html	Make better usage of big screens in lists	2017-02-25 13:28:57 +01:00
login.html
osd.xml
read.html
readpdf.html
readtxt.html
register.html
search_form.html	Added Publisher and search/advanced search/opds search for publisher	2017-02-22 20:59:48 +01:00
search.html
shelf_edit.html
shelf_order.html
shelf.html
stats.html	Additional version info for sqlite database	2017-02-25 09:02:59 +01:00
user_edit.html	Merge branch 'master' into develop	2017-02-26 19:49:49 +00:00