Matthew Hodgson c6a9614372 Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite ... Wmwragg/chat multi invite		2016-09-13 19:31:05 +01:00
..
structures	Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite	2016-09-13 19:31:05 +01:00
views	Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms	2016-09-09 16:27:00 +01:00