Merge branch 'master' into develop
This commit is contained in:
commit
a7bc0e4612
8 changed files with 241 additions and 17 deletions
|
@ -101,7 +101,7 @@ export default class UrlPreviewSettings extends React.Component<IProps> {
|
|||
(
|
||||
<SettingsFlag
|
||||
name={isEncrypted ? "urlPreviewsEnabled_e2ee" : "urlPreviewsEnabled"}
|
||||
level={SettingLevel.ROOM_ACCOUNT}
|
||||
level={SettingLevel.ROOM_DEVICE}
|
||||
roomId={roomId}
|
||||
/>
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue