matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

Browse Source
This commit is contained in:
Travis Ralston
2020-01-09 14:15:09 -07:00
parent 6ca9a7c998 d40091afc5
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/CreateRoomDialog.js
View File

@ -173,7 +173,7 @@ export default createReactClass({
const domain = MatrixClientPeg.get().getDomain();
aliasField = (
<div className="mx_CreateRoomDialog_aliasContainer">
<RoomAliasField id="alias" ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} />
<RoomAliasField id="alias" ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} value={this.state.alias} />
</div>
);
} else {