]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '21jumpst' into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Sat, 7 Jul 2012 07:48:15 +0000 (00:48 -0700)
committerMark Otto <markotto@twitter.com>
Sat, 7 Jul 2012 07:48:15 +0000 (00:48 -0700)
1  2 
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/download.html
docs/javascript.html
less/type.less
less/variables.less

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