Merge branch 'master' of https://github.com/mattermost/platform into mm-1696

Conflicts:
	web/react/components/setting_upload.jsx
	web/react/components/team_import_tab.jsx

1 files changed, 12 insertions, 0 deletions

diff --git a/web/react/components/setting_upload.jsx b/web/react/components/setting_upload.jsx
index 02789f5dd..9f3b399b8 100644
--- a/web/react/components/setting_upload.jsx
+++ b/web/react/components/setting_upload.jsx
@@ -88,6 +88,18 @@ module.exports = React.createClass({
                             <div className='file-status file-name hide'></div>
                             {serverError}
                             {clientError}
+                            <span className='btn btn-sm btn-primary btn-file sel-btn'>Select File<input ref='uploadinput' accept={this.props.fileTypesAccepted} type='file' onChange={this.onFileSelect}/></span>
+                            <a
+                                className={'btn btn-sm btn-primary'}
+                                onClick={this.doSubmit}>
+                                Import
+                            </a>
+                            <a
+                                className='btn btn-sm theme'
+                                href='#'
+                                onClick={this.doCancel}>
+                                Cancel
+                            </a>
                         </li>
                     </ul>
                 </li>