• Ozzieisaacs's avatar
    Merge branch 'Develop' · 26a7d9ef
    Ozzieisaacs authored
    # Conflicts:
    #	cps/__init__.py
    #	cps/about.py
    #	cps/admin.py
    #	cps/cli.py
    #	cps/config_sql.py
    #	cps/constants.py
    #	cps/converter.py
    #	cps/db.py
    #	cps/editbooks.py
    #	cps/gdriveutils.py
    #	cps/helper.py
    #	cps/logger.py
    #	cps/oauth.py
    #	cps/server.py
    #	cps/services/simpleldap.py
    #	cps/ub.py
    #	cps/web.py
    #	cps/worker.py
    #	optional-requirements.txt
    #	setup.cfg
    #	setup.py
    26a7d9ef
helper.py 32.8 KB