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 146068c936 Merge branch 'Develop' ... # Conflicts: # cps/db.py # cps/templates/user_edit.html		5 years ago
..
archive	Merge from master	5 years ago
io	Merge branch 'Develop'	6 years ago
libs	Updated pdf viewer to 2.2.228 (#1184)	5 years ago
reading	Update Updater	5 years ago
caliBlur.js	Merge with branch develop	5 years ago
details.js	Updated translations	6 years ago
edit_books.js	Add ability to store and edit publishers	6 years ago
filter_list.js	Merge branch 'Develop'	6 years ago
get_meta.js	Fix #1210	5 years ago
kthoom.js	Update comic reader js	6 years ago
logviewer.js	Merge with develop:	5 years ago
main.js	Make Kobo optional	5 years ago
shelforder.js	Fix #1170 Auth-digest Header no longer crashs calibre-web	5 years ago
table.js	Handle stream output in logviewer	5 years ago
uploadprogress.js	Merge branch 'Develop'	6 years ago