]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'bs3_jekyll' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)
committerMark Otto <otto@github.com>
Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)
commitae525258af17ef8f14259971442eacbec31d1d01
tree5f5958f83b59356cdac32440183b691afe0c4e7a
parentb1e7010bfcba029180545fe0dcf4d66183ea4a71
parentaa5f09037133f22093c4b97d15451d4e54180ba2
Merge branch 'bs3_jekyll' into 3.0.0-wip

Conflicts:
docs/css.html
docs/templates/pages/css.mustache