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

..

fonts

Redownloaded glyphicon font files #515

2018-05-31 09:33:43 +02:00

images

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

libs

Updated pdf viewer to 2.2.228 (#1184)

2020-02-09 17:02:47 +01:00

caliBlur_override.css

fix linter errors

2020-04-18 23:22:51 -04:00

caliBlur.min.css

Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view

2020-05-14 11:57:38 +02:00

kthoom.css

Code cosmetics

2020-04-27 20:01:13 +02:00

listen.css

Code cosmetics

2020-04-27 20:22:55 +02:00

main.css

Code cosmetics

2020-04-27 20:22:55 +02:00

popup.css

Code cosmetics

2020-04-27 20:01:13 +02:00

style.css

Automatic username (#1172)

2020-05-12 17:23:58 +02:00

upload.css

Code cosmetics

2020-04-27 20:01:13 +02:00