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

pull/21833/head
Weblate 2018-08-15 11:56:19 +00:00
commit 861a360ab2
1 changed files with 1 additions and 0 deletions

View File

@ -255,6 +255,7 @@ export function mkStubRoom(roomId = null) {
getUnfilteredTimelineSet: () => null, getUnfilteredTimelineSet: () => null,
getAccountData: () => null, getAccountData: () => null,
hasMembershipState: () => null, hasMembershipState: () => null,
getVersion: () => '1',
currentState: { currentState: {
getStateEvents: sinon.stub(), getStateEvents: sinon.stub(),
mayClientSendStateEvent: sinon.stub().returns(true), mayClientSendStateEvent: sinon.stub().returns(true),