Michael Telatynski 928294eba3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2		2017-07-21 19:23:42 +01:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2	2017-07-21 19:23:42 +01:00
views	Merge pull request #1241 from matrix-org/luke/refactor-pills	2017-07-21 17:54:20 +01:00