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

2018-06-13 09:03:41 +00:00
parent 4ac8b7747c 5a275fcfef
commit d996e7eebd
1 changed files with 0 additions and 5 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1143,11 +1143,6 @@ export default React.createClass({
        } else if (this._is_registered) {
            this._is_registered = false;

-            // Set the display name = user ID localpart
-            MatrixClientPeg.get().setDisplayName(
-                MatrixClientPeg.get().getUserIdLocalpart(),
-            );
-
            if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
                createRoom({
                    dmUserId: this.props.config.welcomeUserId,