Merge branch 'master' into master

This commit is contained in:
Christopher Charbonneau Wells 2018-03-04 15:07:51 -08:00 committed by GitHub
commit d6181aad06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 393 additions and 1136 deletions

1517
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -19,14 +19,14 @@
"gulp-spawn": "^0.4.0", "gulp-spawn": "^0.4.0",
"gulp-uglify": "^3.0.0", "gulp-uglify": "^3.0.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"moment": "^2.20.1", "moment": "^2.21.0",
"plotly.js": "^1.33.0", "plotly.js": "^1.34.0",
"popper.js": "^1.13.0", "popper.js": "^1.13.0",
"pump": "^2.0.1", "pump": "^3.0.0",
"require-dir": "^0.3.2", "require-dir": "^1.0.0",
"run-sequence": "^2.2.1", "run-sequence": "^2.2.1",
"tempusdominus-bootstrap-4": "^5.0.0-alpha15", "tempusdominus-bootstrap-4": "^5.0.0-alpha17",
"visibilityjs": "^1.2.6" "visibilityjs": "^1.2.7"
}, },
"scripts": { "scripts": {
"heroku-postbuild": "npm rebuild node-sass && gulp build" "heroku-postbuild": "npm rebuild node-sass && gulp build"