summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-12 14:55:52 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-12 14:55:52 -0500
commitc7fe8510ce663feb26056b34fd18c0e833eb3573 (patch)
tree0367dc560667b65a9a5a7011fa277af8aecd5c0e /web/react/components/user_settings
parent931f4f764cbd18f1f5189e03ece83685e4dc6ffa (diff)
parent10901b4d50db171fa83e0c289d0eb34f4422f156 (diff)
downloadchat-c7fe8510ce663feb26056b34fd18c0e833eb3573.tar.gz
chat-c7fe8510ce663feb26056b34fd18c0e833eb3573.tar.bz2
chat-c7fe8510ce663feb26056b34fd18c0e833eb3573.zip
Merge branch 'release-1.2'
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/custom_theme_chooser.jsx1
1 files changed, 0 insertions, 1 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 895d0c500..3dbed72c3 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -129,7 +129,6 @@ export default class CustomThemeChooser extends React.Component {
{'Copy and paste to share theme colors:'}
</label>
<input
- readOnly='true'
type='text'
className='form-control'
value={colors}