• 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
..
de/LC_MESSAGES Loading commit data...
es/LC_MESSAGES Loading commit data...
fr/LC_MESSAGES Loading commit data...
hu/LC_MESSAGES Loading commit data...
it/LC_MESSAGES Loading commit data...
ja/LC_MESSAGES Loading commit data...
km/LC_MESSAGES Loading commit data...
nl/LC_MESSAGES Loading commit data...
pl/LC_MESSAGES Loading commit data...
ru/LC_MESSAGES Loading commit data...
sv/LC_MESSAGES Loading commit data...
uk/LC_MESSAGES Loading commit data...
zh_Hans_CN/LC_MESSAGES Loading commit data...
iso639.pickle Loading commit data...