summaryrefslogtreecommitdiffstats
path: root/webapp/components/logged_in.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-31 12:15:35 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-31 12:15:35 -0400
commit8abd74b89222fb09a5bb3783037f27eeb86303fc (patch)
treeb06b8c207b64952e90556c998a3274a709a4228f /webapp/components/logged_in.jsx
parent5feda3559106e9d1f156fe25761c1a8c7c21db26 (diff)
parent68bc42824a206c881e383deea3e6d7a8086862de (diff)
downloadchat-8abd74b89222fb09a5bb3783037f27eeb86303fc.tar.gz
chat-8abd74b89222fb09a5bb3783037f27eeb86303fc.tar.bz2
chat-8abd74b89222fb09a5bb3783037f27eeb86303fc.zip
Merge pull request #2588 from hmhealey/plt2490
PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available
Diffstat (limited to 'webapp/components/logged_in.jsx')
-rw-r--r--webapp/components/logged_in.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx
index f7a6be647..3b44f5940 100644
--- a/webapp/components/logged_in.jsx
+++ b/webapp/components/logged_in.jsx
@@ -266,7 +266,10 @@ LoggedIn.defaultProps = {
};
LoggedIn.propTypes = {
- children: React.PropTypes.arrayOf(React.PropTypes.element),
+ children: React.PropTypes.oneOfType([
+ React.PropTypes.arrayOf(React.PropTypes.element),
+ React.PropTypes.element
+ ]),
navbar: React.PropTypes.element,
sidebar: React.PropTypes.element,
center: React.PropTypes.element,