diff options
| author | Hannah Chow <hannah_chow@brown.edu> | 2019-03-05 17:38:50 -0500 |
|---|---|---|
| committer | Hannah Chow <hannah_chow@brown.edu> | 2019-03-05 17:38:50 -0500 |
| commit | e64667c09f72e69f8121039809b48167a1d55465 (patch) | |
| tree | 95b55ddc6dcdce566d127ee35d00dbb8bd56c567 /package.json | |
| parent | 9724ff4d5de3c776b34f5d733fd37845b863f29b (diff) | |
| parent | bb1d3120f11a47e9d493202c1003dae52bf6667f (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into hannah_linking
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/package.json b/package.json index d9e8c855e..b911705ac 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,14 @@ "webpack-hot-middleware": "^2.24.3" }, "dependencies": { +<<<<<<< HEAD "@fortawesome/fontawesome-svg-core": "^1.2.14", "@hig/flyout": "^1.0.3", +======= + "@fortawesome/fontawesome-svg-core": "^1.2.15", + "@fortawesome/free-solid-svg-icons": "^5.7.2", + "@fortawesome/react-fontawesome": "^0.1.4", +>>>>>>> bb1d3120f11a47e9d493202c1003dae52bf6667f "@types/bcrypt-nodejs": "0.0.30", "@types/bluebird": "^3.5.25", "@types/body-parser": "^1.17.0", @@ -77,6 +83,7 @@ "expressjs": "^1.0.1", "flexlayout-react": "^0.3.3", "golden-layout": "^1.5.9", + "i": "^0.3.6", "jsonwebtoken": "^8.4.0", "jsx-to-string": "^1.4.0", "lodash": "^4.17.11", @@ -88,7 +95,7 @@ "node-sass": "^4.11.0", "nodemon": "^1.18.10", "normalize.css": "^8.0.1", - "npm": "^6.7.0", + "npm": "^6.8.0", "passport": "^0.4.0", "passport-local": "^1.0.0", "prosemirror-commands": "^1.0.7", @@ -101,6 +108,7 @@ "prosemirror-transform": "^1.1.3", "prosemirror-view": "^1.7.1", "pug": "^2.0.3", + "raw-loader": "^1.0.0", "react": "^16.5.2", "react-dimensions": "^1.3.1", "react-dom": "^16.7.0", |