Merge remote-tracking branch 'jmchilton/citations' into dev

Browse Source

...

This commit is contained in:

Dannon Baker

2017-11-30 15:09:56 -05:00

parent 5124c56109 d8fe56c670

commit 1385cf4f83

11 changed files with 69 additions and 28 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/admin.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/analysis.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/login.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/masthead.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/viz.bundled.js

+2 -2

File diff suppressed because one or more lines are too long

static/scripts/bundled/workflow.bundled.js

+2 -2

File diff suppressed because one or more lines are too long