summaryrefslogtreecommitdiffstats
path: root/web/react/components/more_direct_channels.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-25 22:42:38 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-25 22:42:38 -0700
commit70b5918734d996a2b5b3710c2ed519f77f4764d4 (patch)
tree12aac9f88de68cb79404a3985e6bfe774ad8f066 /web/react/components/more_direct_channels.jsx
parent473221dbada7ad7739d6a969d9d3d5c9c276941b (diff)
parentae2898107d275176126ab07ca1886fd7fd7ddad4 (diff)
downloadchat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.gz
chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.bz2
chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.zip
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/more_direct_channels.jsx')
-rw-r--r--web/react/components/more_direct_channels.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 743e30854..41746d1d7 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -169,7 +169,7 @@ export default class MoreDirectChannels extends React.Component {
}
return (
- <tr>
+ <tr key={'direct-channel-row-user' + user.id}>
<td
key={user.id}
className='direct-channel'