Merge up from develop

2016-07-30 12:10:43 +01:00 · 2016-07-30 12:10:43 +01:00 · cf22a5fecc
commit cf22a5fecc
parent 1487c600ee 88be2827fd
8 changed files with 22 additions and 21 deletions
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@ -325,7 +325,6 @@ module.exports = React.createClass({

        return (
            <GeminiScrollbar className="mx_RoomList_scrollbar"
-                 relayoutOnUpdate={false}
                 autoshow={true} onScroll={ self._repositionTooltips } ref="gemscroll">
            <div className="mx_RoomList">
                <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }