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

This commit is contained in:
Weblate 2018-10-03 03:24:18 +00:00
commit c7e08f3160

View file

@ -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,
}); });