Merge branch 'dev' into collection_builder_enhancements

Browse Source

...

This commit is contained in:

Martin Cech

2017-03-27 17:11:42 -04:00

parent 82ca6931c0 967d0b6c0a

commit 810a96caef

22 changed files with 311 additions and 78 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

static/scripts/bundled/analysis.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/analysis.bundled.js.map

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/bundled/libs.bundled.js.map

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/mvc/tool/tools.js

+1 -1

File diff suppressed because one or more lines are too long