Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:33:36 +01:00
parent bf0fe63759 19d727ab88
commit a2ab36f598
58 changed files with 844 additions and 1044 deletions
@@ -11,3 +11,4 @@ npm-debug.log
 /karma-reports

 /.idea
+/src/component-index.js