Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master' ...

# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py

2020-04-05 17:31:41 +02:00

..

__init__.py

Kobo sync enable/disable working

2020-01-27 20:32:37 +01:00

goodreads_support.py

Fix #1016

2019-08-20 18:32:04 +02:00

simpleldap.py

Merge remote-tracking branch 'ldap/master'

2020-04-05 17:31:41 +02:00

SyncToken.py

Merge remote-tracking branch 'fix/kobo'

2020-02-23 13:17:59 +01:00