summaryrefslogtreecommitdiffstats
path: root/web/react/components/navbar.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-15 08:20:01 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-15 08:20:01 -0400
commit4a9984d166ff939129740f69e1bd382769a954bb (patch)
tree1e035ed97b937066f27c72899c240689efe58e66 /web/react/components/navbar.jsx
parentbfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff)
parent4c9ae22b6207c477b92737f4e79901c7366a4792 (diff)
downloadchat-4a9984d166ff939129740f69e1bd382769a954bb.tar.gz
chat-4a9984d166ff939129740f69e1bd382769a954bb.tar.bz2
chat-4a9984d166ff939129740f69e1bd382769a954bb.zip
Merge pull request #676 from hmhealey/mm1900b
MM-1900 Removed textToJsx
Diffstat (limited to 'web/react/components/navbar.jsx')
-rw-r--r--web/react/components/navbar.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 2258bf2b3..cae9f12e4 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -332,7 +332,7 @@ export default class Navbar extends React.Component {
popoverContent = React.renderToString(
<MessageWrapper
message={channel.description}
- options={{singleline: true, noMentionHighlight: true}}
+ options={{singleline: true, mentionHighlight: false}}
/>
);
isAdmin = this.state.member.roles.indexOf('admin') > -1;