Merge remote-tracking branch 'origin/experimental' into dbkr/sas

2019-01-23 17:32:18 +00:00
parent 60a8d560d1 94b1d739fb
commit 6a90625d36
172 changed files with 1885 additions and 661 deletions
@@ -84,6 +84,12 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_tabbed_settings": {
+        isFeature: true,
+        displayName: _td("Tabbed settings"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "feature_custom_status": {
        isFeature: true,
        displayName: _td("Custom user status messages"),