Michael Telatynski c0002e7778 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events		2017-11-15 16:03:07 +00:00
..
structures	Merge pull request #1516 from turt2live/travis/granular-settings	2017-11-15 10:55:55 +00:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events	2017-11-15 16:03:07 +00:00