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 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		5 years ago
..
fonts	Redownloaded glyphicon font files #515	7 years ago
images	Merge branch 'Develop'	6 years ago
libs	Updated pdf viewer to 2.2.228 (#1184)	5 years ago
caliBlur.min.css	Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view	5 years ago
caliBlur_override.css	fix linter errors	5 years ago
kthoom.css	Code cosmetics	5 years ago
listen.css	Code cosmetics	5 years ago
main.css	Code cosmetics	5 years ago
popup.css	Code cosmetics	5 years ago
style.css	Automatic username (#1172)	5 years ago
upload.css	Code cosmetics	5 years ago