Richard Lewis 0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes		2017-08-17 17:47:46 +01:00
..
structures	Merge pull request #1300 from matrix-org/dbkr/userpicker	2017-08-16 14:29:07 +01:00
views	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00