diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /web/react/components/mention.jsx | |
parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/mention.jsx')
-rw-r--r-- | web/react/components/mention.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx index aeed724a8..050887c6f 100644 --- a/web/react/components/mention.jsx +++ b/web/react/components/mention.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. var UserStore = require('../stores/user_store.jsx'); +const Utils = require('../utils/utils.jsx'); export default class Mention extends React.Component { constructor(props) { @@ -25,7 +26,7 @@ export default class Mention extends React.Component { <span> <img className='mention-img' - src={'/api/v1/users/' + this.props.id + '/image?time=' + timestamp} + src={'/api/v1/users/' + this.props.id + '/image?time=' + timestamp + '&' + Utils.getSessionIndex()} /> </span> ); |