]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip...
authorMark Otto <otto@github.com>
Thu, 18 Jul 2013 02:33:30 +0000 (19:33 -0700)
committerMark Otto <otto@github.com>
Thu, 18 Jul 2013 02:33:30 +0000 (19:33 -0700)
commit542e03ae3a2209b87e4db999b6ea869faf9293a9
treed7dd6d8784884eb96b0d7bb7d6a33bd62baa61f5
parent06d47b008233c487844146cf1cc037d691068a0a
parentb4e0e4fee65fb50f7981d28bb875083e0da1a303
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam

Conflicts:
docs/components.html
docs/css.html
docs/customize.html
docs/assets/css/docs.css
docs/components.html
docs/css.html
docs/customize.html
docs/getting-started.html
docs/javascript.html