• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · b160a8de
    Ozzieisaacs authored
    # Conflicts:
    #	cps/__init__.py
    #	cps/comic.py
    #	cps/editbooks.py
    #	cps/helper.py
    #	cps/kobo.py
    #	cps/translations/nl/LC_MESSAGES/messages.mo
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/ub.py
    #	cps/uploader.py
    #	cps/web.py
    b160a8de
Name
Last commit
Last update
..
archive Loading commit data...
io Loading commit data...
libs Loading commit data...
reading Loading commit data...
caliBlur.js Loading commit data...
details.js Loading commit data...
edit_books.js Loading commit data...
filter_list.js Loading commit data...
get_meta.js Loading commit data...
kthoom.js Loading commit data...
logviewer.js Loading commit data...
main.js Loading commit data...
shelforder.js Loading commit data...
table.js Loading commit data...
uploadprogress.js Loading commit data...