]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12412
authorMark Otto <otto@github.com>
Tue, 11 Feb 2014 17:50:40 +0000 (09:50 -0800)
committerMark Otto <otto@github.com>
Tue, 11 Feb 2014 17:50:40 +0000 (09:50 -0800)
commit8551f42ae2935c96bd37ae8ed15198a0cc22ede2
tree77498aad62c25da55fb121470d91623c14873f58
parentb36d19c3c6caf89fbe996678bdefe3f7e9a69281
parent2cef0af211e8b6780fff90fe5f110493585aa97c
Merge branch 'master' into pr/12412

Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/mixins.less
test-infra/npm-shrinkwrap.canonical.json