• 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
..
fonts Loading commit data...
images Loading commit data...
libs Loading commit data...
caliBlur.min.css Loading commit data...
kthoom.css Loading commit data...
listen.css Loading commit data...
main.css Loading commit data...
popup.css Loading commit data...
style.css Loading commit data...
upload.css Loading commit data...