]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_navbar_overhaul 9403/head
authorMark Otto <otto@github.com>
Tue, 13 Aug 2013 20:48:33 +0000 (13:48 -0700)
committerMark Otto <otto@github.com>
Tue, 13 Aug 2013 20:48:33 +0000 (13:48 -0700)
commitbd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3
tree2a59b9815cb02226a694c345cf942c9ad869810f
parent3c772b1cebfed73570247691917b40fcf3d95aa2
parenta8769b8cab1799168b31f1a5afd403f323a6b6d4
Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Conflicts:
dist/css/bootstrap.min.css
assets/css/docs.css
components.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/dropdowns.less