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

2019-05-14 21:07:03 +01:00
parent 46132a2463 92c67cdcab
commit 277c4ab809
21 changed files with 413 additions and 177 deletions
@@ -125,7 +125,7 @@ export const SETTINGS = {
    },
    "feature_reactions": {
        isFeature: true,
-        displayName: _td("React to messages with emoji"),
+        displayName: _td("React to messages with emoji (refresh to apply changes)"),
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },