diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
| commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
| tree | 44962a914b86cf66a1da49300f12986db49f010e /web/react/components/post_list.jsx | |
| parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
| parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
| download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip | |
Fixing merge
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> ); } |