Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-06-15 11:04:16 +00:00
commit 96ed64e273
1 changed files with 0 additions and 6 deletions

View File

@ -88,12 +88,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_tag_panel": {
isFeature: true,
displayName: _td("Tag Panel"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"MessageComposerInput.dontSuggestEmoji": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Disable Emoji suggestions while typing'),