matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-09 08:42:50 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282

Browse Source 
 Conflicts:
	package.json
	yarn.lock
This commit is contained in:
Michael Telatynski
2021-06-14 21:39:06 +01:00
parent 2879b9086c 91df392a2a
commit 66fce64ee0
141 changed files with 3216 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/utils/permalinks/Permalinks-test.js
View File

@@ -34,7 +34,7 @@ function mockRoom(roomId, members, serverACL) {
return {
roomId,
getCanonicalAlias: () => roomId,
getCanonicalAlias: () => null,
getJoinedMembers: () => members,
getMember: (userId) => members.find(m => m.userId === userId),
currentState: {