Merge 82c2e9a into f37c03a

mattermost · Mar 3, 2017 · 4ce8601 · 4ce8601
2 parents f37c03a + 82c2e9a
commit 4ce8601
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx
@@ -40,7 +40,7 @@ const holders = defineMessages({
     },
     handleHolder: {
         id: 'rename_channel.handleHolder',
-        defaultMessage: 'lowercase alphanumeric&#39;s only'
+        defaultMessage: 'lowercase alphanumeric characters'
     }
 });
 

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -1744,7 +1744,7 @@
   "rename_channel.defaultError": " - Cannot be changed for the default channel",
   "rename_channel.displayName": "Display Name",
   "rename_channel.displayNameHolder": "Enter display name",
-  "rename_channel.handleHolder": "lowercase alphanumeric&#39;s only",
+  "rename_channel.handleHolder": "lowercase alphanumeric characters",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than 22 characters",
   "rename_channel.required": "This field is required",