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

..

css

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

img

…

js

…

locale

…

favicon.ico

…

generic_cover.jpg

…