]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.2-wip' v2.2.0
authorMark Otto <otto@github.com>
Tue, 30 Oct 2012 05:01:58 +0000 (22:01 -0700)
committerMark Otto <otto@github.com>
Tue, 30 Oct 2012 05:01:58 +0000 (22:01 -0700)
Conflicts:
js/bootstrap-dropdown.js

1  2 
js/bootstrap-dropdown.js
less/responsive-navbar.less

Simple merge
Simple merge