]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1
authorMark Otto <markotto@twitter.com>
Sun, 12 Feb 2012 01:28:07 +0000 (17:28 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 12 Feb 2012 01:28:07 +0000 (17:28 -0800)
1  2 
docs/base-css.html
docs/templates/pages/base-css.mustache

Simple merge