• 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
..
css Loading commit data...
img Loading commit data...
js Loading commit data...
locale Loading commit data...
favicon.ico Loading commit data...
generic_cover.jpg Loading commit data...