Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

2017-05-23 15:16:31 +01:00
parent 46bb29a3af
commit d419c42a4f
73 changed files with 4660 additions and 639 deletions
@@ -50,6 +50,7 @@
    "browser-request": "^0.3.3",
    "classnames": "^2.1.2",
    "commonmark": "^0.27.0",
+    "counterpart-riot": "^0.18.1",
    "draft-js": "^0.8.1",
    "draft-js-export-html": "^0.5.0",
    "draft-js-export-markdown": "^0.2.0",