]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs-theme-toggler
authorMark Otto <otto@github.com>
Wed, 21 May 2014 06:27:40 +0000 (23:27 -0700)
committerMark Otto <otto@github.com>
Wed, 21 May 2014 06:27:40 +0000 (23:27 -0700)
commit707b362b801d7a430c1911493a65085e81b4ee8d
treeb659b23c3884e9100c1e800161e96110a0853294
parentbdd822a94cdf2d452e067569e76ca1537dc74d8d
parent3dd1531d81c90d6d1cf04962032f868d315ab21c
Merge branch 'master' into docs-theme-toggler

Conflicts:
docs/assets/css/docs.min.css
12 files changed:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_includes/header.html
docs/assets/css/_src/docs.css
docs/assets/css/docs.min.css
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js