Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master ... # Conflicts: # cps/jinjia.py # cps/templates/detail.html # cps/templates/discover.html # cps/templates/index.html # cps/web.py		2020-10-10 12:47:49 +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	Fix "is not a valid language" on upload of comic books	2020-09-20 15:05:52 +02:00
caliBlur_override.css	UI improvements table buttons	2020-06-12 21:40:09 +02:00
caliBlur.css	Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master	2020-10-10 12:29:30 +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	Merge remote-tracking branch 'Knepherbird/master' into master	2020-10-10 12:47:49 +02:00
upload.css	Code cosmetics	2020-04-27 20:01:13 +02:00