Merge branch 'master' into onboard_modal_css_removal

This commit is contained in:
Eric Schultz 2019-01-30 16:55:07 -06:00 committed by GitHub
commit 10510ccb27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -8916,9 +8916,9 @@
}
},
"marked": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
"integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
},
"math-expression-evaluator": {
"version": "1.2.17",

View file

@ -114,7 +114,7 @@
"immutable": "3.7.5",
"jquery": "1.11.1",
"jquery.cookie": "1.4.1",
"marked": "0.3.6",
"marked": "^0.3.18",
"mobx": "^4.3.1",
"mobx-react": "^5.2.3",
"mobx-react-devtools": "^5.0.1",