Merge remote-tracking branch 'origin/develop' into read_receipts

2015-11-10 11:27:43 +00:00
parent 7882780357 d4549e60cc
commit 2f783a7ba9
13 changed files with 67 additions and 76 deletions
@@ -27,7 +27,8 @@
    "matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop",
    "optimist": "^0.6.1",
    "q": "^1.4.1",
-    "react": "^0.13.3",
+    "react": "^0.14.2",
+    "react-dom": "^0.14.2",
    "react-loader": "^1.4.0"
  },
  "//deps": "The loader packages are here because webpack in a project that depends on us needs them in this package's node_modules folder",