]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #8307 from cvrebert/8287-docs-patch
authorMark Otto <markdotto@gmail.com>
Fri, 28 Jun 2013 01:38:34 +0000 (18:38 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 28 Jun 2013 01:38:34 +0000 (18:38 -0700)
Fix #8287

1  2 
docs/components.html
docs/css.html
docs/javascript.html

Simple merge
diff --cc docs/css.html
Simple merge
Simple merge