Merge remote-tracking branch 'origin/develop' into release-v0.12.0

2018-03-19 14:56:07 +00:00 · 2018-03-19 14:56:07 +00:00 · 296e2b0a22
parent 6fbd4e04fa 0f6a21849e
commit 296e2b0a22
1 changed files with 0 additions and 6 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -94,12 +94,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'),