diff options
| author | Mark Otto <[email protected]> | 2012-01-24 12:28:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 12:28:37 -0800 |
| commit | f32866c2fceee5b760d0647884b9e63be8ed8888 (patch) | |
| tree | 50fbb2dd0d3cbf39fafb9f9b24aaeeaff01f6aae /js | |
| parent | e829001e5cb488a7708878b074205fc41e82fc82 (diff) | |
| parent | b5503c4c28d4f9d80f3285922376f0552808d40e (diff) | |
| download | bootstrap-f32866c2fceee5b760d0647884b9e63be8ed8888.tar.xz bootstrap-f32866c2fceee5b760d0647884b9e63be8ed8888.zip | |
Merge branch '2.0-wip' of 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" ); |