Merge branch 'master' into develop

This commit is contained in:
Michael Telatynski 2024-08-06 11:46:52 +01:00
commit a7bc0e4612
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
8 changed files with 241 additions and 17 deletions

View file

@ -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}
/>
);