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

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00 · 2020-09-17 11:58:26 +01:00 · 4213a557f2
commit 4213a557f2
parent dfabe79335 2ad08c8394
11 changed files with 105 additions and 73 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@ -627,4 +627,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
    },
+    [UIFeature.Feedback]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 };
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@ -19,4 +19,5 @@ export enum UIFeature {
    URLPreviews = "UIFeature.urlPreviews",
    Widgets = "UIFeature.widgets",
    Voip = "UIFeature.voip",
+    Feedback = "UIFeature.feedback",
 }