Ozzieisaacs 4708347c16 Merge branch 'Develop' ... # Conflicts: # MANIFEST.in # README.md # cps/helper.py # cps/static/js/archive/archive.js # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/updater.py # cps/web.py # cps/worker.py # optional-requirements.txt		2019-07-13 20:54:21 +02:00
..
archive	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
io	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
libs	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
reading	Disable bookmarking when anonymous users are reading	2017-09-30 10:51:20 -07:00
caliBlur.js	Update version	2019-05-30 10:21:11 +02:00
details.js	Updated translations	2019-01-20 19:37:45 +01:00
edit_books.js	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
filter_list.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
get_meta.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
kthoom.js	Update comic reader js	2019-06-17 19:48:17 +02:00
logviewer.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
main.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
shelforder.js	Updated translations	2019-01-20 19:37:45 +01:00
table.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00
uploadprogress.js	Merge branch 'Develop'	2019-07-13 20:54:21 +02:00