• 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
.github/ISSUE_TEMPLATE Loading commit data...
cps Loading commit data...
test Loading commit data...
.editorconfig Loading commit data...
.eslintrc Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
CONTRIBUTING.md Loading commit data...
LICENSE Loading commit data...
MANIFEST.in Loading commit data...
README.md Loading commit data...
babel.cfg Loading commit data...
cps.py Loading commit data...
messages.pot Loading commit data...
optional-requirements.txt Loading commit data...
requirements.txt Loading commit data...
setup.cfg Loading commit data...
setup.py Loading commit data...