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

This commit is contained in:
Will Hunt 2019-05-07 20:04:29 +01:00 committed by GitHub
commit efc93abb50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 2034 additions and 1165 deletions

View file

@ -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,
},