Ozzieisaacs 26a7d9ef30 Merge branch 'Develop' ...

# 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

2019-07-17 19:07:05 +02:00

..

__init__.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

goodreads.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

simpleldap.py

Merge branch 'Develop'

2019-07-17 19:07:05 +02:00