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

2019-05-07 20:04:29 +01:00
parent 020d210cb0 09a9b2e15e
commit efc93abb50
48 changed files with 2034 additions and 1165 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -122,6 +122,9 @@ export const SETTINGS = {
    "feature_notification_sounds": {
        isFeature: true,
        displayName: _td("Custom Notification Sounds"),
+    "feature_reactions": {
+        isFeature: true,
+        displayName: _td("React to messages with emoji"),
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },