Merge branch 'develop' into new-guest-access

Conflicts: src/component-index.js
2017-05-11 13:22:30 +01:00 · 2017-05-11 13:22:30 +01:00 · 5151264f60
commit 5151264f60
parent 6ba1d382b0 8a76c0c142
33 changed files with 718 additions and 568 deletions
--- a/test/components/structures/ScrollPanel-test.js
+++ b/test/components/structures/ScrollPanel-test.js
@ -115,7 +115,7 @@ var Tester = React.createClass({
        //
        // there is an extra 50 pixels of margin at the bottom.
        return (
-            <li key={key} data-scroll-token={key}>
+            <li key={key} data-scroll-tokens={key}>
                <div style={{height: '98px', margin: '50px', border: '1px solid black',
                             backgroundColor: '#fff8dc' }}>
                   {key}