]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' into bs3-normalize
authorMark Otto <otto@github.com>
Thu, 20 Dec 2012 22:02:54 +0000 (14:02 -0800)
committerMark Otto <otto@github.com>
Thu, 20 Dec 2012 22:02:54 +0000 (14:02 -0800)
Conflicts:
less/bootstrap.less

1  2 
docs/assets/css/bootstrap.css
less/bootstrap.less

Simple merge
Simple merge