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.
parallel-library/cps/static/js
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
6 years ago
..
archive Merge branch 'Develop' 6 years ago
io Merge branch 'Develop' 6 years ago
libs Merge branch 'Develop' 6 years ago
reading Disable bookmarking when anonymous users are reading 7 years ago
caliBlur.js Update version 6 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 Merge branch 'Develop' 6 years ago
kthoom.js Update comic reader js 6 years ago
logviewer.js Merge branch 'Develop' 6 years ago
main.js Merge branch 'Develop' 6 years ago
shelforder.js Updated translations 6 years ago
table.js Merge branch 'Develop' 6 years ago
uploadprogress.js Merge branch 'Develop' 6 years ago