Matthew Hodgson c4421f6bc7 Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators ... Wmwragg/one to one indicators		2016-09-09 15:08:20 +01:00
..
vector	Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators	2016-09-09 15:08:20 +01:00