• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · 4fecce0a
    Ozzieisaacs authored
    # Conflicts:
    #	cps/helper.py
    #	cps/static/js/archive/unrar.js
    #	cps/templates/readcbr.html
    #	cps/templates/readpdf.html
    #	cps/translations/de/LC_MESSAGES/messages.mo
    #	cps/translations/de/LC_MESSAGES/messages.po
    #	cps/translations/es/LC_MESSAGES/messages.mo
    #	cps/translations/es/LC_MESSAGES/messages.po
    #	cps/translations/fr/LC_MESSAGES/messages.mo
    #	cps/translations/fr/LC_MESSAGES/messages.po
    #	cps/translations/it/LC_MESSAGES/messages.mo
    #	cps/translations/it/LC_MESSAGES/messages.po
    #	cps/translations/ja/LC_MESSAGES/messages.mo
    #	cps/translations/ja/LC_MESSAGES/messages.po
    #	cps/translations/km/LC_MESSAGES/messages.mo
    #	cps/translations/km/LC_MESSAGES/messages.po
    #	cps/translations/nl/LC_MESSAGES/messages.mo
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/translations/pl/LC_MESSAGES/messages.mo
    #	cps/translations/pl/LC_MESSAGES/messages.po
    #	cps/translations/ru/LC_MESSAGES/messages.mo
    #	cps/translations/ru/LC_MESSAGES/messages.po
    #	cps/translations/sv/LC_MESSAGES/messages.mo
    #	cps/translations/sv/LC_MESSAGES/messages.po
    #	cps/translations/uk/LC_MESSAGES/messages.mo
    #	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
    #	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
    #	cps/web.py
    #	messages.pot
    #	optional-requirements.txt
    4fecce0a
Name
Last commit
Last update
..
bootstrap-datepicker Loading commit data...
bootstrap-table Loading commit data...
tinymce Loading commit data...
Sortable.min.js Loading commit data...
bar-ui.js Loading commit data...
bootstrap-rating-input.min.js Loading commit data...
bootstrap.min.js Loading commit data...
compatibility.js Loading commit data...
compromise.min.js Loading commit data...
context.js Loading commit data...
context.min.js Loading commit data...
debugger.js Loading commit data...
epub.min.js Loading commit data...
intention.js Loading commit data...
intention.min.js Loading commit data...
jquery.form.js Loading commit data...
jquery.min.js Loading commit data...
jquery.min.map Loading commit data...
jquery.visible.min.js Loading commit data...
jszip.min.js Loading commit data...
l10n.js Loading commit data...
pdf.js Loading commit data...
pdf.worker.js Loading commit data...
plugins.js Loading commit data...
reader.min.js Loading commit data...
readmore.min.js Loading commit data...
screenfull.min.js Loading commit data...
soundmanager2.js Loading commit data...
typeahead.bundle.js Loading commit data...
underscore-min.js Loading commit data...
underscore-min.map Loading commit data...
viewer.js Loading commit data...