]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12813
authorMark Otto <otto@github.com>
Sat, 22 Feb 2014 20:20:53 +0000 (12:20 -0800)
committerMark Otto <otto@github.com>
Sat, 22 Feb 2014 20:20:53 +0000 (12:20 -0800)
commit4ccf088a24b8c0f9694458c81d44514559712a65
tree60a79f54e70487da7cea4ae27e1cbd5a4cb027e3
parent49094844ac55a0e08d6d847b0e07868f8b639037
parentb99be29f32f3db208b47bd33fbef1f63405ccfdc
Merge branch 'master' into pr/12813

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
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