]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.2.2-wip' into exploratory
authorMark Otto <otto@github.com>
Sun, 4 Nov 2012 20:37:44 +0000 (12:37 -0800)
committerMark Otto <otto@github.com>
Sun, 4 Nov 2012 20:37:44 +0000 (12:37 -0800)
1  2 
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/type.less

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