1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-02-03 13:21:21 +02:00
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
..
2020-02-17 18:42:53 +01:00