diff options
| author | Jacob Thornton <[email protected]> | 2011-12-21 14:03:18 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-21 14:03:18 -0800 |
| commit | a5a98a8a984512011dac1216b432b86c6eff96a4 (patch) | |
| tree | 15d14c92a97a0179a0501d8457edc97008a18d91 /docs/javascript.html | |
| parent | 80cb760fac507ce207a6174f8886417d32d4b5ed (diff) | |
| parent | 069ef6a020dc177bbf4e18a9b425af36b3395ecf (diff) | |
| download | bootstrap-a5a98a8a984512011dac1216b432b86c6eff96a4.tar.xz bootstrap-a5a98a8a984512011dac1216b432b86c6eff96a4.zip | |
Merge branch '2.0-wip' of https://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 8dc3ba9d8..acde34d46 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -829,7 +829,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <pre class="prettyprint linenums"><button class="btn" data-complete-text="finished!" >...</button> <script> $('.btn').button('complete') -</scrip></pre> +</script></pre> <h3>Demo</h3> <table class="bordered-table striped-table"> <tbody> |