You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
admin.html	English Language Updates	5 years ago
author.html	…
book_edit.html	Merge remote-tracking branch 'kobo_book_delete' into Develop	5 years ago
book_exists_flash.html	…
config_edit.html	Merge remote-tracking branch 'English_texts/master'	5 years ago
config_view_edit.html	Merge remote-tracking branch 'English_texts/master'	5 years ago
detail.html	Merge remote-tracking branch 'kobo_book_delete' into Develop	5 years ago
discover.html	…
email_edit.html	Update Translation	5 years ago
feed.xml	…
fragment.html	…
generate_kobo_auth_url.html	Update Translation (german and russian)	5 years ago
http_error.html	Chang link to issue template	5 years ago
index.html	Merge branch 'Develop'	5 years ago
index.xml	Fixes for Kobo sync	5 years ago
json.txt	…
languages.html	…
layout.html	Update Translation	5 years ago
list.html	Fix #1021	5 years ago
listenmp3.html	English Language Updates	5 years ago
login.html	English Language Updates	5 years ago
logviewer.html	English Language Updates	5 years ago
modal_restriction.html	Renamed restrict -> deny	5 years ago
osd.xml	Fixes for Kobo sync	5 years ago
read.html	English Language Updates	5 years ago
readcbr.html	…
readpdf.html	Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)	5 years ago
readtxt.html	Merge from master	5 years ago
register.html	English Language Updates	5 years ago
remote_login.html	English Language Updates	5 years ago
search.html	Update Translation	5 years ago
search_form.html	Merge remote-tracking branch 'English_texts/master'	5 years ago
shelf.html	Update Translation	5 years ago
shelf_edit.html	English Language Updates	5 years ago
shelf_order.html	Merge remote-tracking branch 'English_texts/master'	5 years ago
shelfdown.html	…
stats.html	English Language Updates	5 years ago
tasks.html	English Language Updates	5 years ago
user_edit.html	Merge remote-tracking branch 'English_texts/master'	5 years ago