diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
| commit | 9036dd99aa8ba2d9cdd6066a833862bbd9e2653a (patch) | |
| tree | 41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/react/components/channel_header.jsx | |
| parent | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff) | |
| parent | 26a8e19a357aee9e1b39623e604ce92bdfaa00df (diff) | |
| download | chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.gz chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.bz2 chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.zip | |
Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
Diffstat (limited to 'web/react/components/channel_header.jsx')
| -rw-r--r-- | web/react/components/channel_header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 4d64e2b94..90a776791 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -156,7 +156,7 @@ module.exports = React.createClass({ } var channel = this.state.channel; - var description = utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true, noTextFormatting: true}); + var description = utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true}); var popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>); var channelTitle = channel.display_name; var currentId = UserStore.getCurrentId(); |