summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-11-14 07:09:41 -0500
committerChristopher Speller <crspeller@gmail.com>2016-11-14 07:09:41 -0500
commit323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch)
treeefc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/i18n/en.json
parentd1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff)
parentb55ec6148caa93d54b660afe55408c643d217108 (diff)
downloadchat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz
chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2
chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 6cacc67e8..466861847 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -990,10 +990,10 @@
"channel_header.manageMembers": "Manage Members",
"channel_header.notificationPreferences": "Notification Preferences",
"channel_header.recentMentions": "Recent Mentions",
+ "channel_header.removeFromFavorites": "Remove from Favorites",
"channel_header.rename": "Rename {term}",
"channel_header.setHeader": "Edit {term} Header",
"channel_header.setPurpose": "Edit {term} Purpose",
- "channel_header.removeFromFavorites": "Remove from Favorites",
"channel_header.viewInfo": "View Info",
"channel_header.viewMembers": "View Members",
"channel_header.webrtc.call": "Start Video Call",