matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-30 02:21:17 +03:00
Code Activity

merge develop

Browse Source
This commit is contained in:
Matthew Hodgson
2018-07-09 17:50:07 +01:00
parent 6299e188a4 e61317284b
commit efdc5430d7
176 changed files with 7537 additions and 3401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ describe('TimelinePanel', function() {
// now, if we update the events, there shouldn't be any
// more requests.
client.paginateEventTimeline.reset();
client.paginateEventTimeline.resetHistory();
panel.forceUpdate();
expect(messagePanel.props.backPaginating).toBe(false);
setTimeout(() => {