Richard van der Hoff ac4b36c0dd Merge commit '99d2392' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js		2016-02-23 13:32:23 +00:00
..
structures	Merge commit '99d2392' into rav/roomview_works	2016-02-23 13:32:23 +00:00
views	Merge commit 'eb91faf' into rav/roomview_works	2016-02-23 12:56:54 +00:00