Squash merge https://github.com/vector-im/riot-web/pull/3636

2017-05-23 14:12:53 +01:00
parent 7d59742a22
commit 6b6fa59f3e
36 changed files with 7547 additions and 186 deletions
@@ -56,6 +56,7 @@
    "babel-runtime": "^6.11.6",
    "browser-request": "^0.3.3",
    "classnames": "^2.1.2",
+    "counterpart-riot": "^0.17.9",
    "draft-js": "^0.8.1",
    "extract-text-webpack-plugin": "^0.9.1",
    "favico.js": "^0.3.10",