diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
tree | dc5000a3584952c797c03bf4331282a5e1536848 /webapp/components/admin_console | |
parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip |
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 2 | ||||
-rw-r--r-- | webapp/components/admin_console/cluster_settings.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index db978c808..a2f2b75c0 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -96,7 +96,7 @@ export default class AdminSidebar extends React.Component { title={ <FormattedMessage id='admin.sidebar.cluster' - defaultMessage='High Availability (Beta)' + defaultMessage='High Availability' /> } /> diff --git a/webapp/components/admin_console/cluster_settings.jsx b/webapp/components/admin_console/cluster_settings.jsx index ad27989c3..895a87ce1 100644 --- a/webapp/components/admin_console/cluster_settings.jsx +++ b/webapp/components/admin_console/cluster_settings.jsx @@ -53,7 +53,7 @@ export default class ClusterSettings extends AdminSettings { return ( <FormattedMessage id='admin.advance.cluster' - defaultMessage='High Availability (Beta)' + defaultMessage='High Availability' /> ); } |