Merge branch 'feature/collab-plugin'

# Conflicts: # yarn.lock
2019-05-06 10:16:01 +02:00
parent 0c0435f009 a22185de57
commit 0ee4560265
18 changed files with 1139 additions and 942 deletions
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
  "devDependencies": {
    "@babel/core": "^7.4.4",
    "@babel/node": "^7.2.2",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/plugin-transform-runtime": "^7.4.4",
    "@babel/polyfill": "^7.4.4",
@@ -88,5 +89,7 @@
    "webpack-svgstore-plugin": "^4.1.0",
    "zlib": "^1.0.5"
  },
-  "dependencies": {}
+  "dependencies": {
+    "socket.io-client": "^2.2.0"
+  }
 }