Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/helper.py

...

This commit is contained in:

Ozzieisaacs

2020-05-10 19:04:29 +02:00

parent 308fd55483 92db00692a

commit 16a3deec2c

12 changed files with 412 additions and 391 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

678

cps/static/js/caliBlur.js

File diff suppressed because it is too large Load Diff

4

cps/static/js/libs/jquery.min.js vendored

File diff suppressed because one or more lines are too long

2

cps/static/js/libs/jquery.min.map vendored

File diff suppressed because one or more lines are too long

9

cps/static/js/libs/underscore-min.js vendored

File diff suppressed because one or more lines are too long

2

cps/static/js/libs/underscore-min.map vendored

File diff suppressed because one or more lines are too long