diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 12:11:26 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 12:11:26 -0800 |
| commit | b5503c4c28d4f9d80f3285922376f0552808d40e (patch) | |
| tree | e2467846d77a93e4867a523a57a0fc44d12150a2 /js | |
| parent | 222067b360ecf4c6c082d3d364d464a26ef13ae9 (diff) | |
| parent | 91780529d5f355054d17420f56a6b11e2d40b2a9 (diff) | |
| download | bootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.tar.xz bootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/tests/vendor/jquery.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js index 4c7013a87..00c4e23a2 100644 --- a/js/tests/vendor/jquery.js +++ b/js/tests/vendor/jquery.js @@ -1461,7 +1461,7 @@ jQuery.support = (function() { // Check if div with explicit width and no margin-right incorrectly // gets computed margin-right based on width of container. For more // info see bug #3333 - // Fails in WebKit before Feb 2012 nightlies + // Fails in WebKit before Feb 2011 nightlies // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right if ( window.getComputedStyle ) { marginDiv = document.createElement( "div" ); |
