Merge pull request #32 from matrix-org/read_receipts

Read receipts
2015-11-18 14:53:25 +00:00
parent 257a65de14 31b083d93e
commit caabe02fca
9 changed files with 209 additions and 39 deletions
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
    "flux": "^2.0.3",
    "glob": "^5.0.14",
    "linkifyjs": "^2.0.0-beta.4",
-    "matrix-js-sdk": "^0.3.0",
+    "matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop",
    "optimist": "^0.6.1",
    "q": "^1.4.1",
    "react": "^0.14.2",