diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /webapp/components/post_view | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'webapp/components/post_view')
| -rw-r--r-- | webapp/components/post_view/components/post.jsx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webapp/components/post_view/components/post.jsx b/webapp/components/post_view/components/post.jsx index 913c2af95..fba4ce9eb 100644 --- a/webapp/components/post_view/components/post.jsx +++ b/webapp/components/post_view/components/post.jsx @@ -204,9 +204,7 @@ export default class Post extends React.Component { src={PostUtils.getProfilePicSrcForPost(post, timestamp)} /> ); - } - - if (PostUtils.isSystemMessage(post)) { + } else if (PostUtils.isSystemMessage(post)) { profilePic = ( <span className='icon' |