]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox...
authorMark Otto <otto@github.com>
Tue, 14 Jan 2014 04:01:54 +0000 (20:01 -0800)
committerMark Otto <otto@github.com>
Tue, 14 Jan 2014 04:01:54 +0000 (20:01 -0800)
commitf4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc
treec75b7a1c96df2d5095a61fc838aead93b5c27849
parentdf70e8d8458b63ca813466c9d8d0fa3aa2b716ff
parent29e495f03cda05fd7fc362420ae86619c27b582e
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/nav-css.html
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