diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 11:31:10 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 11:31:10 -0400 |
commit | fa312f5b4708ee354cef1e15ac03790f46a3f757 (patch) | |
tree | 37a88a60898aa89991ad30e7c0dbf1a2cd1c9cba /web/react/components/post_list.jsx | |
parent | 7eef5be3596470321df8a7a0c6b07aa9cc6edb07 (diff) | |
parent | f7a32fa38a5c9f33d7fbb3d73d240626211173cc (diff) | |
download | chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.tar.gz chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.tar.bz2 chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.zip |
Merge pull request #760 from chengweiv5/PLT-126
PLT-126: Change 'Private Messages' to 'Direct Messages'
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r-- | web/react/components/post_list.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 703e548fb..218922b67 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -326,8 +326,8 @@ export default class PostList extends React.Component { <strong><UserProfile userId={teammate.id} /></strong> </div> <p className='channel-intro-text'> - {'This is the start of your private message history with ' + teammateName + '.'}<br/> - {'Private messages and files shared here are not shown to people outside this area.'} + {'This is the start of your direct message history with ' + teammateName + '.'}<br/> + {'Direct messages and files shared here are not shown to people outside this area.'} </p> <a className='intro-links' @@ -346,7 +346,7 @@ export default class PostList extends React.Component { return ( <div className='channel-intro'> - <p className='channel-intro-text'>{'This is the start of your private message history with this teammate. Private messages and files shared here are not shown to people outside this area.'}</p> + <p className='channel-intro-text'>{'This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.'}</p> </div> ); } |