Merge branch 'develop' into hs/custom-notif-sounds

2019-05-15 16:09:55 +01:00 · 2019-05-15 16:09:55 +01:00 · 2994d99378
commit 2994d99378
parent d752de0972 76570beb3c
34 changed files with 1430 additions and 19 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -119,6 +119,12 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_message_editing": {
+        isFeature: true,
+        displayName: _td("Edit messages after they have been sent (refresh to apply changes)"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "feature_notification_sounds": {
        isFeature: true,
        displayName: _td("Custom Notification Sounds"),