diff options
| author | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
| commit | 312ee6cdfb20f7602924c90e6ae37cba62a39da4 (patch) | |
| tree | 1931bb96def7cc20931b6f763fcd934abaeddeb8 /docs/javascript.html | |
| parent | b12b71bf7ca76437a532122d8efff59506b61530 (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.tar.xz bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 09cdc714c..c541d57fb 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -757,7 +757,7 @@ $('a[data-toggle="tab"]').bind('shown', function (e) { </section> - <!-- Button + <!-- Button ================================================== --> <section id="button"> |