• 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
..
libs Loading commit data...
reading Loading commit data...
archive.js Loading commit data...
bytestream.js Loading commit data...
caliBlur.js Loading commit data...
details.js Loading commit data...
edit_books.js Loading commit data...
filter_list.js Loading commit data...
get_meta.js Loading commit data...
io.js Loading commit data...
kthoom.js Loading commit data...
main.js Loading commit data...
shelforder.js Loading commit data...
table.js Loading commit data...
unrar.js Loading commit data...
untar.js Loading commit data...
unzip.js Loading commit data...
uploadprogress.js Loading commit data...