Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps.py
#	cps/web.py

...

This commit is contained in:

Ozzie Isaacs

2021-08-27 16:16:24 +02:00

parent a35c635987 7ae3255ea9

commit 3946ef8f0d

15 changed files with 86 additions and 54 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

4

cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js vendored

File diff suppressed because one or more lines are too long