]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into boulox-responsive-embed
authorMark Otto <otto@github.com>
Fri, 7 Mar 2014 06:40:25 +0000 (22:40 -0800)
committerMark Otto <otto@github.com>
Fri, 7 Mar 2014 06:40:25 +0000 (22:40 -0800)
commit12c619f5b9149a4d3f4d24efe106504b6a8a5004
treedacdd064110d04b8195151c08ef4e5713ba3ea24
parentf4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc
parent7e299c6a49bced5d2c2581a5504ddf7dbcaf041f
Merge branch 'master' into boulox-responsive-embed

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
dist/css/bootstrap-rtl.css
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/nav-css.html
docs/assets/js/raw-files.min.js
docs/css.html
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css