Merge branch 'develop' into matthew/twemoji

2019-05-20 16:38:44 +01:00
parent e764ba4890 db73e641ea
commit d3f06763b3
17 changed files with 236 additions and 60 deletions
@@ -52,6 +52,7 @@ 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} />
                </div>
            </div>
        );