diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /js/button.js | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/button.js b/js/button.js index 80705eafd..2df193a9c 100644 --- a/js/button.js +++ b/js/button.js @@ -2,12 +2,13 @@ * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2014 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // BUTTON PUBLIC CLASS DEFINITION // ============================== |