]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Mon, 4 Aug 2014 22:09:23 +0000 (15:09 -0700)
committerMark Otto <otto@github.com>
Mon, 4 Aug 2014 22:09:23 +0000 (15:09 -0700)
commit724240fe4f2cba653cec0aad217dd133aaa9e051
tree48e8ee949ec664305e252c983f121d28d5d5bc5d
parent9e92b74aa3a3d5807d3201ac4ea1778ea120274f
parent9096c2002123a6dafdf0c3d9df5d069c968d738e
Merge branch 'master' into derp

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customizer-variables.html
docs/_includes/js/overview.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/carousel.less
15 files changed:
Gruntfile.js
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customize-nav.html
docs/assets/css/docs.min.css
docs/browser-bugs.md
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/javascript/overview.md
less/.csslintrc
less/buttons.less
less/carousel.less
package.json