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

2018-10-03 03:24:18 +00:00 · 2018-10-03 03:24:18 +00:00 · c7e08f3160
parent 9484141a87 2f35eded37
commit c7e08f3160
1 changed files with 1 additions and 2 deletions
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@ -248,8 +248,7 @@ function textForCanonicalAliasEvent(ev) {
            senderName: senderName,
            address: ev.getContent().alias,
        });
-    }
-    else if (oldAlias) {
+    } else if (oldAlias) {
        return _t('%(senderName)s removed the main address for this room.', {
            senderName: senderName,
        });