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

..

fonts

Redownloaded glyphicon font files #515

2018-05-31 09:33:43 +02:00

images

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

libs

Merge branch 'master' into Develop

2019-02-16 10:17:46 +01:00

caliBlur.min.css

fixed description read-more button

2019-02-20 12:57:38 -05:00

kthoom.css

-Added a more subtle progress bar which only shows the page number on hover

2017-12-10 02:43:51 -05:00

listen.css

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

main.css

Epub Viewer Bugfix Retenia Ipad devices

2017-07-09 16:28:22 +02:00

popup.css

Update epub reader and pdf reader

2016-07-09 16:54:13 +08:00

style.css

Merge branch 'master' into Develop

2019-03-10 08:31:10 +01:00

upload.css

fixing issue #833

2019-03-08 20:44:45 -05:00