2 commits

Author	SHA1	Message	Date
David Baker	79ee41351c	Fix typo	2017-09-04 15:45:28 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00