• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · b4d7733e
    Ozzieisaacs authored
    # Conflicts:
    #	cps/templates/list.html
    #	cps/translations/cs/LC_MESSAGES/messages.po
    #	cps/translations/de/LC_MESSAGES/messages.po
    #	cps/translations/es/LC_MESSAGES/messages.po
    #	cps/translations/fi/LC_MESSAGES/messages.po
    #	cps/translations/fr/LC_MESSAGES/messages.po
    #	cps/translations/hu/LC_MESSAGES/messages.po
    #	cps/translations/it/LC_MESSAGES/messages.po
    #	cps/translations/ja/LC_MESSAGES/messages.po
    #	cps/translations/km/LC_MESSAGES/messages.po
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/translations/pl/LC_MESSAGES/messages.po
    #	cps/translations/ru/LC_MESSAGES/messages.po
    #	cps/translations/sv/LC_MESSAGES/messages.po
    #	cps/translations/uk/LC_MESSAGES/messages.po
    #	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
    #	messages.pot
    b4d7733e
Name
Last commit
Last update
..
admin.html Loading commit data...
author.html Loading commit data...
book_edit.html Loading commit data...
book_exists_flash.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...
generate_kobo_auth_url.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...
logviewer.html Loading commit data...
modal_restriction.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...