Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds

2019-05-31 10:44:30 +01:00
parent 2994d99378 2d8c523642
commit 9369e964fa
143 changed files with 3498 additions and 1773 deletions
@@ -52,6 +52,8 @@ export default class LabsUserSettingsTab extends React.Component {
                <div className="mx_SettingsTab_section">
                    {flags}
                    <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
+                    <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
+                    <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
                </div>
            </div>
        );