Richard van der Hoff 9eff426819 Merge commit '71e2495' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js		2016-02-23 13:24:38 +00:00
..
structures	Merge commit '71e2495' into rav/roomview_works	2016-02-23 13:24:38 +00:00
views	Merge commit 'eb91faf' into rav/roomview_works	2016-02-23 12:56:54 +00:00