Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Automated cherry pick of #7096 #7097

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions components/admin_console/admin_definition.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5336,16 +5336,6 @@ const AdminDefinition = {
// placeholder: t('admin.experimental.replyToAddress.example'),
// placeholder_default: 'E.g.: "reply-to@example.com"',
// },
{
type: Constants.SettingsTypes.TYPE_BOOL,
key: 'ExperimentalSettings.CloudBilling',
label: t('admin.experimental.cloudBilling.title'),
label_default: 'Cloud Billing:',
help_text: t('admin.experimental.cloudBilling.desc'),
help_text_default: 'Show the new billing view for Cloud',
help_text_markdown: false,
isHidden: it.not(it.licensedForFeature('Cloud')),
},
],
},
},
Expand Down
2 changes: 0 additions & 2 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,6 @@
"admin.experimental.clientSideCertEnable.title": "Enable Client-Side Certification:",
"admin.experimental.closeUnusedDirectMessages.desc": "When true, direct message conversations with no activity for 7 days will be hidden from the sidebar. When false, conversations remain in the sidebar until they are manually closed.",
"admin.experimental.closeUnusedDirectMessages.title": "Autoclose Direct Messages in Sidebar:",
"admin.experimental.cloudBilling.desc": "Show the new billing view for Cloud",
"admin.experimental.cloudBilling.title": "Cloud Billing:",
"admin.experimental.defaultTheme.desc": "Set a default theme that applies to all new users on the system.",
"admin.experimental.defaultTheme.title": "Default Theme:",
"admin.experimental.emailBatchingBufferSize.desc": "Specify the maximum number of notifications batched into a single email.",
Expand Down