• Ozzieisaacs's avatar
    Merge branch 'Develop' · 4708347c
    Ozzieisaacs authored
    # Conflicts:
    #	MANIFEST.in
    #	README.md
    #	cps/helper.py
    #	cps/static/js/archive/archive.js
    #	cps/translations/nl/LC_MESSAGES/messages.mo
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/ub.py
    #	cps/updater.py
    #	cps/web.py
    #	cps/worker.py
    #	optional-requirements.txt
    4708347c