]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 25 Jun 2014 23:57:22 +0000 (16:57 -0700)
committerMark Otto <otto@github.com>
Wed, 25 Jun 2014 23:57:22 +0000 (16:57 -0700)
commit4045740c54504ede15f831c877f134752b6c12be
treec3291b31e7dd119fbf43028300f49213e9912652
parente40df7cfacef0b581810c8ec661923054541638c
parent4abb0957833c7158563244d1770ab9a5e6966150
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css