imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

Browse source
This commit is contained in:
Michael Telatynski 2021-08-11 20:51:47 +01:00
commit 5f54abc7e5
50 changed files with 2854 additions and 873 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/tabs/user/LabsUserSettingsTab.js
View file

@ -79,7 +79,7 @@ export default class LabsUserSettingsTab extends React.Component {
let hiddenReadReceipts;
if (this.state.showHiddenReadReceipts) {
hiddenReadReceipts = (
<SettingsFlag name="feature_hidden_read_receipts" level={SettingLevel.ACCOUNT} />
<SettingsFlag name="feature_hidden_read_receipts" level={SettingLevel.DEVICE} />
);
}