Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md

...

This commit is contained in:

Ozzieisaacs

2019-02-16 10:17:46 +01:00

parent 4230226716 56826f67fc

commit 37007dafee

14 changed files with 282 additions and 435 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/js/libs/bootstrap.min.js

Vendored

+3 -4

File diff suppressed because one or more lines are too long

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

Vendored

+2 -5

File diff suppressed because one or more lines are too long

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

Vendored

+1 -1

File diff suppressed because one or more lines are too long

cps/static/js/libs/plugins.js

Vendored

+14 -13

File diff suppressed because one or more lines are too long

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

Vendored

+3 -4

File diff suppressed because one or more lines are too long

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

Vendored

+1 -1

File diff suppressed because one or more lines are too long