matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

Browse Source
This commit is contained in:
Travis Ralston
2020-01-09 14:15:09 -07:00
parent 6ca9a7c998 d40091afc5
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TextForEvent.js
View File

@@ -473,7 +473,7 @@ function textForPowerEvent(event) {
}
function textForPinnedEvent(event) {
const senderName = event.getSender();
const senderName = event.sender ? event.sender.name : event.getSender();
return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
}