Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop ... # Conflicts: # cps/kobo.py # cps/services/SyncToken.py # cps/templates/book_edit.html # cps/ub.py		2020-03-12 20:43:39 +01:00
..
__init__.py
goodreads_support.py
simpleldap.py
SyncToken.py	Merge remote-tracking branch 'kobo_book_delete' into Develop	2020-03-12 20:43:39 +01:00