]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into modular-the-mixins
authorMark Otto <otto@github.com>
Mon, 10 Mar 2014 07:08:29 +0000 (00:08 -0700)
committerMark Otto <otto@github.com>
Mon, 10 Mar 2014 07:08:29 +0000 (00:08 -0700)
commita36643dd338537a9b4319fbab6e1dbf2e7d1cf9c
treea097e839bc115709770b6e1b533a63bf653e58f0
parent3a2d6e40503019823bf197f278681e830bc14f31
parent6dd51fab44df852697564f6257403b57f85f492b
Merge branch 'master' into modular-the-mixins

Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
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