diff options
| author | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
| commit | 7e6797880a969de8b3d44be91dbc765b6ab48612 (patch) | |
| tree | 6078fa9bad27d829eaeb6bf9016399a8f75702e1 /docs/assets | |
| parent | 8ff621aa26dee69088b527089cdd719bce68be31 (diff) | |
| parent | 03d2128f5072791ca4578a4e50a4540df7c9d121 (diff) | |
| download | bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.tar.xz bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/js/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 2da4ab8e2..95caa0f31 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -22,7 +22,7 @@ $(function(){ window.prettyPrint && prettyPrint() // table sort example - if ($.fn.tableSorter) { + if ($.fn.tablesorter) { $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) $(".tablesorter-example").tablesorter({ sortList: [[1,0]] }) } |