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

2020-07-14 10:17:43 +01:00
parent a54b18adfe f394190423
commit aea3ad48b5
17 changed files with 34 additions and 86 deletions
@@ -170,6 +170,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
        ev.stopPropagation();

        // TODO: Archived room view: https://github.com/vector-im/riot-web/issues/14038
+        // Note: You'll need to uncomment the button too.
        console.log("TODO: Show archived rooms");
    };