• 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
style.css 5.82 KB