Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		2020-05-17 16:22:58 +02:00
..
archive
io
libs
reading
caliBlur.js
details.js
edit_books.js
filter_grid.js
filter_list.js
get_meta.js
kthoom.js
logviewer.js
main.js
shelforder.js
table.js
uploadprogress.js