Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2

2017-05-04 14:04:22 +01:00
parent ce119a6364 694fc26a55
commit e1c99430cb
8 changed files with 77 additions and 47 deletions
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -60,7 +60,7 @@ module.exports = React.createClass({
            }
        }
        return (
-            <li data-scroll-token={eventId+"+"+j}>
+            <li data-scroll-tokens={eventId+"+"+j}>
                {ret}
            </li>);
    },