• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · da3fcb9a
    Ozzieisaacs authored
    # 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
    da3fcb9a
Name
Last commit
Last update
..
admin.html Loading commit data...
author.html Loading commit data...
book_edit.html Loading commit data...
config_edit.html Loading commit data...
config_view_edit.html Loading commit data...
detail.html Loading commit data...
discover.html Loading commit data...
email_edit.html Loading commit data...
feed.xml Loading commit data...
fragment.html Loading commit data...
http_error.html Loading commit data...
index.html Loading commit data...
index.xml Loading commit data...
json.txt Loading commit data...
languages.html Loading commit data...
layout.html Loading commit data...
list.html Loading commit data...
listenmp3.html Loading commit data...
login.html Loading commit data...
osd.xml Loading commit data...
read.html Loading commit data...
readcbr.html Loading commit data...
readpdf.html Loading commit data...
readtxt.html Loading commit data...
register.html Loading commit data...
remote_login.html Loading commit data...
search.html Loading commit data...
search_form.html Loading commit data...
shelf.html Loading commit data...
shelf_edit.html Loading commit data...
shelf_order.html Loading commit data...
shelfdown.html Loading commit data...
stats.html Loading commit data...
tasks.html Loading commit data...
user_edit.html Loading commit data...