Erik Johnston f17a9b14c2 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings		2015-07-16 10:46:40 +01:00
..
MatrixChat.js	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings	2015-07-16 10:46:40 +01:00