summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_header.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-23 10:53:57 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-23 10:53:57 +0500
commitcc904a7ec73a44a337908c685bfc311bdbe1ff85 (patch)
tree6fb865bb734cad0389490e4add11f2e308fe473c /web/react/components/post_header.jsx
parent79ce0dd914713aac9d2f1332202a48e7e0d338a3 (diff)
parent02a6f6b2cd4c0a6bf32b23961557c385039ae2f2 (diff)
downloadchat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.gz
chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.bz2
chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.zip
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/post_header.jsx')
-rw-r--r--web/react/components/post_header.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx
index 0ba5ce6b5..45e60c767 100644
--- a/web/react/components/post_header.jsx
+++ b/web/react/components/post_header.jsx
@@ -16,7 +16,7 @@ export default class PostHeader extends React.Component {
let botIndicator;
if (post.props && post.props.from_webhook) {
- if (post.props.override_username && global.window.config.EnablePostUsernameOverride === 'true') {
+ if (post.props.override_username && global.window.mm_config.EnablePostUsernameOverride === 'true') {
userProfile = (
<UserProfile
userId={post.user_id}