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

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00 · 2020-09-17 13:31:00 +01:00 · 5bf6697e48
commit 5bf6697e48
parent 9cc789756b 148a57c58e
17 changed files with 167 additions and 100 deletions
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@ -17,5 +17,8 @@ limitations under the License.
 // see settings.md for documentation on conventions
 export enum UIFeature {
    URLPreviews = "UIFeature.urlPreviews",
+    Widgets = "UIFeature.widgets",
+    Voip = "UIFeature.voip",
+    Feedback = "UIFeature.feedback",
    Flair = "UIFeature.flair",
 }