diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-08-02 09:41:12 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-08-02 09:41:12 -0800 |
| commit | 247708d924770737a3c03f956b19d8096da2bdea (patch) | |
| tree | 3d6bd381545e660808f74a1379048e57cc0c6717 /web/react/components/delete_channel_modal.jsx | |
| parent | e76fc37b6df7d53ea86a5b42009d5d1161741270 (diff) | |
| parent | 718d670d699e295fcad903d507bc989c51a1ef50 (diff) | |
| download | chat-247708d924770737a3c03f956b19d8096da2bdea.tar.gz chat-247708d924770737a3c03f956b19d8096da2bdea.tar.bz2 chat-247708d924770737a3c03f956b19d8096da2bdea.zip | |
Merge branch 'master' into mm-1619
Diffstat (limited to 'web/react/components/delete_channel_modal.jsx')
| -rw-r--r-- | web/react/components/delete_channel_modal.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx index e23a37740..64ceec450 100644 --- a/web/react/components/delete_channel_modal.jsx +++ b/web/react/components/delete_channel_modal.jsx @@ -47,7 +47,7 @@ module.exports = React.createClass({ </p> </div> <div className="modal-footer"> - <button type="button" className="btn btn-default" data-dismiss="modal">Close</button> + <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button> <button type="button" className="btn btn-danger" data-dismiss="modal" onClick={this.handleDelete}>Delete</button> </div> </div> |