matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Code Activity

Merge branch 'develop' into new-guest-access

Browse Source 
Conflicts:
	src/component-index.js
This commit is contained in:
Luke Barnard
2017-05-11 13:22:30 +01:00
parent 6ba1d382b0 8a76c0c142
commit 5151264f60
33 changed files with 718 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/components/structures/ScrollPanel-test.js
View File

@ -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}