]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_theme
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 00:31:58 +0000 (17:31 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 00:31:58 +0000 (17:31 -0700)
commitba20e512ce53e7cc771ba06d492a01d48db6cc97
tree30cebcbb796725c7dc06c9125714d83adbf585c3
parent2af9cf10ce2e93fe0ac07651d405abc484e4c608
parente29c23afab2577e05cfaa41f64a20f1ca87222fc
Merge branch '3.0.0-wip' into bs3_theme

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/bootstrap.less