]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap...
authorMark Otto <otto@github.com>
Sun, 20 Jan 2013 01:06:40 +0000 (17:06 -0800)
committerMark Otto <otto@github.com>
Sun, 20 Jan 2013 01:06:40 +0000 (17:06 -0800)
1  2 
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache

Simple merge
Simple merge