summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-22 12:24:39 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-22 12:24:39 -0700
commitfc71869a9638dbb4a715f85680915cf1c12a1ae4 (patch)
tree7fd7ddccbd3102e9af316ee0a17faa2106a77e7d /web/react/components
parent88e5a71e8c93b495cedaa07931a4f8052d9f12ed (diff)
parenta44e8f0cd904d386caea410398dcaf7dbfd9c138 (diff)
downloadchat-fc71869a9638dbb4a715f85680915cf1c12a1ae4.tar.gz
chat-fc71869a9638dbb4a715f85680915cf1c12a1ae4.tar.bz2
chat-fc71869a9638dbb4a715f85680915cf1c12a1ae4.zip
Merge branch 'master' into PLT-11-email
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/new_channel_modal.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx
index 1488a1431..c43137744 100644
--- a/web/react/components/new_channel_modal.jsx
+++ b/web/react/components/new_channel_modal.jsx
@@ -150,7 +150,7 @@ export default class NewChannelModal extends React.Component {
tabIndex='2'
/>
<p className='input__help'>
- {'This is the purpose of your channel and helps others decide whether to join.'}
+ {'Description helps others decide whether to join this channel.'}
</p>
{serverError}
</div>