You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-08 21:42:24 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -248,8 +248,7 @@ function textForCanonicalAliasEvent(ev) {
|
|||||||
senderName: senderName,
|
senderName: senderName,
|
||||||
address: ev.getContent().alias,
|
address: ev.getContent().alias,
|
||||||
});
|
});
|
||||||
}
|
} else if (oldAlias) {
|
||||||
else if (oldAlias) {
|
|
||||||
return _t('%(senderName)s removed the main address for this room.', {
|
return _t('%(senderName)s removed the main address for this room.', {
|
||||||
senderName: senderName,
|
senderName: senderName,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user