Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts: js/bootstrap-collapse.js

Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts: js/bootstrap-collapse.js
3285f4c3 · Ivan Khalopik · 3c7a43a1 · 7cbb1c04 · 3285f4c3 · 3285f4c3
Commit 3285f4c3 authored 11 years ago by Ivan Khalopik
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 84 additions and 86 deletions
+84 -86
--- a/less/popovers.less
+++ b/less/popovers.less
--- a/less/print.less
+++ b/less/print.less
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
--- a/less/tables.less
+++ b/less/tables.less
--- a/less/type.less
+++ b/less/type.less
--- a/less/variables.less
+++ b/less/variables.less
--- a/package.json
+++ b/package.json