aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorSam Wilkins <abdullah_ahmed@brown.edu>2019-03-17 13:27:33 -0400
committerSam Wilkins <abdullah_ahmed@brown.edu>2019-03-17 13:27:33 -0400
commitbc97c3d8b057ec73f6726c31cf8bbe37e679e0d0 (patch)
tree10031eb180ffde65538b617a7fec74b8be9d3bd1 /package.json
parent978c2139753e677020d6d3e149ebe51b6443b1dc (diff)
parent47da497aded0bafdc5c85c8a79a9a06d0d401e92 (diff)
merged with master, resolved conflicts and reformatted workspace menu
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/package.json b/package.json
index 195d0fcfa..0ecea53ae 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
"@types/passport-local": "^1.0.33",
"@types/prosemirror-commands": "^1.0.1",
"@types/prosemirror-history": "^1.0.1",
+ "@types/prosemirror-inputrules": "^1.0.2",
"@types/prosemirror-keymap": "^1.0.1",
"@types/prosemirror-model": "^1.7.0",
"@types/prosemirror-schema-basic": "^1.0.1",
@@ -145,6 +146,7 @@
"request": "^2.88.0",
"socket.io": "^2.2.0",
"socket.io-client": "^2.2.0",
+ "socketio": "^1.0.0",
"url-loader": "^1.1.2",
"uuid": "^3.3.2",
"xoauth2": "^1.2.0"