]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip
authorMark Otto <markotto@twitter.com>
Fri, 10 Feb 2012 07:20:05 +0000 (23:20 -0800)
committerMark Otto <markotto@twitter.com>
Fri, 10 Feb 2012 07:20:05 +0000 (23:20 -0800)
1  2 
docs/assets/css/bootstrap.css
docs/templates/pages/upgrading.mustache

Simple merge