diff options
| author | Melissa Zhang <mzhang19096@gmail.com> | 2020-07-03 17:58:47 -0700 |
|---|---|---|
| committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-07-03 17:58:47 -0700 |
| commit | 0e3d35d1139d0edc9247837124c3ffdc0b7201e5 (patch) | |
| tree | f7f315ec4a4fe44bb3808369710df4a59a09a5c9 /package.json | |
| parent | 58b780563c7fc4a1496f5c676f2d14faddb096e0 (diff) | |
| parent | df00289aad1c35e3811c02aada6479a5490e9650 (diff) | |
merge with master again
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json index 2a08a6bf1..75dc817f5 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "@types/passport-local": "^1.0.33", "@types/pdfjs-dist": "^2.1.4", "@types/prosemirror-commands": "^1.0.1", + "@types/prosemirror-dev-tools": "^2.1.0", "@types/prosemirror-history": "^1.0.1", "@types/prosemirror-inputrules": "^1.0.2", "@types/prosemirror-keymap": "^1.0.2", @@ -120,6 +121,7 @@ "@hig/flyout": "^1.2.1", "@hig/theme-context": "^2.1.3", "@hig/theme-data": "^2.16.1", + "@material-ui/core": "^4.11.0", "@types/google-maps": "^3.2.2", "@types/webscopeio__react-textarea-autocomplete": "^4.6.1", "@webscopeio/react-textarea-autocomplete": "^4.7.0", @@ -171,6 +173,7 @@ "jsonschema": "^1.2.5", "libxmljs": "^0.19.7", "lodash": "^4.17.15", + "material-ui": "^0.20.2", "mobile-detect": "^1.4.4", "mobx": "^5.15.3", "mobx-react": "^5.3.5", |