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

Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault

Browse Source 
 Conflicts:
	src/components/views/dialogs/InviteDialog.js
This commit is contained in:
Michael Telatynski
2020-06-01 21:42:31 +01:00
parent 0016d8e744 5caae2051b
commit 8848a2ea64
305 changed files with 9256 additions and 4200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ export default createReactClass({
let publicPrivateLabel;
let aliasField;
if (this.state.isPublic) {
publicPrivateLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
publicPrivateLabel = (<p>{_t("Set a room address to easily share your room with other people.")}</p>);
const domain = MatrixClientPeg.get().getDomain();
aliasField = (
<div className="mx_CreateRoomDialog_aliasContainer">