diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 11:57:07 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 11:57:07 -0700 |
| commit | 9d582a5a7ad758a10f456d769f020ac0b7933c16 (patch) | |
| tree | 807024e4715fbacc079f7b0135fab1d0b27fbb3f /web | |
| parent | b7ada27c019598afe95ac4fb6b0a63f394510785 (diff) | |
| parent | c4788e0473d662413d9854e2e6e518ceb860cbbe (diff) | |
| download | chat-9d582a5a7ad758a10f456d769f020ac0b7933c16.tar.gz chat-9d582a5a7ad758a10f456d769f020ac0b7933c16.tar.bz2 chat-9d582a5a7ad758a10f456d769f020ac0b7933c16.zip | |
Merge pull request #10 from mattermost/master
to me
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/user_settings.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index a9c2433f2..110634b50 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1056,7 +1056,7 @@ var AppearanceTab = React.createClass({ themeSection = ( <SettingItemMax - title="Theme" + title="Theme Color" inputs={inputs} submit={this.submitTheme} server_error={server_error} @@ -1066,7 +1066,7 @@ var AppearanceTab = React.createClass({ } else { themeSection = ( <SettingItemMin - title="Theme" + title="Theme Color" describe={this.state.theme} updateSection={function(){self.props.updateSection("theme");}} /> |