summaryrefslogtreecommitdiffstats
path: root/web/react/components/setting_picture.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-22 21:35:29 -0700
committerCorey Hulen <corey@hulen.com>2015-10-22 21:35:29 -0700
commit6a1934192f9e58b73bebdb4cfba555b281c81f13 (patch)
tree22f29ee70d3e87ec1cd0cfe50ba8442123105733 /web/react/components/setting_picture.jsx
parent5ecf45e109a5910959e0cc6927b826ce5a406a7d (diff)
parent7384b0791e54b0fd980ce8c321566c2c42289c02 (diff)
downloadchat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.gz
chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.bz2
chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.zip
Merge pull request #1129 from mattermost/PLT-44
PLT-44 Inital support for multi-tab multi-team login
Diffstat (limited to 'web/react/components/setting_picture.jsx')
-rw-r--r--web/react/components/setting_picture.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/setting_picture.jsx b/web/react/components/setting_picture.jsx
index 2f577fe39..b6bcb13a6 100644
--- a/web/react/components/setting_picture.jsx
+++ b/web/react/components/setting_picture.jsx
@@ -79,7 +79,7 @@ export default class SettingPicture extends React.Component {
>Save</a>
);
}
- var helpText = 'Upload a profile picture in either JPG or PNG format, at least ' + global.window.config.ProfileWidth + 'px in width and ' + global.window.config.ProfileHeight + 'px height.';
+ var helpText = 'Upload a profile picture in either JPG or PNG format, at least ' + global.window.mm_config.ProfileWidth + 'px in width and ' + global.window.mm_config.ProfileHeight + 'px height.';
var self = this;
return (