Skip to content

Commit

Permalink
Merge branch 'white/integracion' of git.assembla.com:faraday into whi…
Browse files Browse the repository at this point in the history
…te/integracion
  • Loading branch information
micabot committed Oct 2, 2015
2 parents 035cff8 + dff805f commit ee257cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (C) 2013 Infobyte LLC (http://www.infobytesec.com/) -->
<!-- See the file 'doc/LICENSE' for the license information -->

<form>
<form novalidate>
<div class="modal-header">
<div class="modal-button">
<button class="btn btn-success" ng-click="okEdit()">OK</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (C) 2013 Infobyte LLC (http://www.infobytesec.com/) -->
<!-- See the file 'doc/LICENSE' for the license information -->

<form name="form">
<form name="form" novalidate>
<div class="modal-header">
<div class="modal-button">
<button class="btn btn-success" ng-disabled="form.$invalid || date.$invalid" ng-click="okNew()">Save</button>
Expand Down

0 comments on commit ee257cb

Please sign in to comment.