Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py

...

This commit is contained in:

Ozzieisaacs

2020-05-17 16:22:58 +02:00

parent 13994a5f96 742799b4ac

commit 38c28f4358

28 changed files with 9318 additions and 1304 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

cps/static/css/caliBlur.min.css

Vendored

+7977 -1

File diff suppressed because one or more lines are too long

cps/static/js/caliBlur.js

+495 -473

File diff suppressed because it is too large Load Diff