diff options
| author | Mark Otto <[email protected]> | 2012-01-30 00:43:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-30 00:43:57 -0800 |
| commit | 0f088af855908dc2e093772cfcf54c30893b952a (patch) | |
| tree | a13151ebb642eb5455aed2c4631fc97184218233 /js | |
| parent | ae7f94eeff733584cbdc80a2d13a85f136a7744e (diff) | |
| parent | 734bfe7f78574477a264f5ed430dc266d29f38f4 (diff) | |
| download | bootstrap-0f088af855908dc2e093772cfcf54c30893b952a.tar.xz bootstrap-0f088af855908dc2e093772cfcf54c30893b952a.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index ee36840d2..8134cc42f 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -71,7 +71,7 @@ this.$element .removeClass('collapse') - [dimension](size || '') + [dimension](size || 'auto') [0].offsetWidth this.$element.addClass('collapse') |