diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
| commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
| tree | 44962a914b86cf66a1da49300f12986db49f010e /web/react/components/new_channel_modal.jsx | |
| parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
| parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
| download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip | |
Fixing merge
Diffstat (limited to 'web/react/components/new_channel_modal.jsx')
| -rw-r--r-- | web/react/components/new_channel_modal.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index c43137744..c8ef59b4a 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -93,6 +93,7 @@ export default class NewChannelModal extends React.Component { <span> <Modal show={this.props.show} + bsSize='large' onHide={this.props.onModalDismissed} > <Modal.Header closeButton={true}> @@ -122,7 +123,7 @@ export default class NewChannelModal extends React.Component { /> {displayNameError} <p className='input__help dark'> - {'Channel URL: ' + prettyTeamURL + this.props.channelData.name + ' ('} + {'URL: ' + prettyTeamURL + this.props.channelData.name + ' ('} <a href='#' onClick={this.props.onChangeURLPressed} |