]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commitb5af762ef59e1fa97f4386f5feadb67aa5183fef
tree3bcd0841e6938379e8c8ae7259ee16f27a49ea41
parent7426ced0fb288a9e86f18da1849ad74f652d219a
parent68cfedb34af198f178128f8c9bc8ea164e44304a
Merge branch '2.1.2-wip'

Conflicts:
js/bootstrap-dropdown.js
js/bootstrap-dropdown.js
less/responsive-navbar.less