]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Thu, 10 Jul 2014 05:19:23 +0000 (22:19 -0700)
committerMark Otto <otto@github.com>
Thu, 10 Jul 2014 05:19:23 +0000 (22:19 -0700)
commitdae1a68fb15be9015760df32e85d764ef092db44
tree23dbce03ca690c069a35b3577377bff9a06cf432
parent216bc3d68b6a9016b3c5fdf90d82cbb291a28f96
parent643effe382bb12b4ff1460e9e1987948b1763990
Merge branch 'master' into derp

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
12 files changed:
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/_includes/components/badges.html
docs/_includes/components/navs.html
docs/_includes/css/images.md
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/examples/jumbotron-narrow/index.html
docs/examples/theme/index.html