Merge upstream and resolve conflicts

2021-07-21 11:35:27 +05:30 · 2021-07-21 11:35:27 +05:30 · 1ed316851a
commit 1ed316851a
parent 98aa1fe6b3 91cf27e252
317 changed files with 4628 additions and 3071 deletions
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@ -145,7 +145,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
                isExpanded={this.state.menuDisplayed}
                label={_t("User Status")}
            >
-                {avatar}
+                { avatar }
            </ContextMenuButton>

            { contextMenu }