]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 3 May 2013 21:11:23 +0000 (14:11 -0700)
committerMark Otto <otto@github.com>
Fri, 3 May 2013 21:11:23 +0000 (14:11 -0700)
1  2 
docs/assets/css/bootstrap.css
less/forms.less

Simple merge
diff --cc less/forms.less
Simple merge