]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12639
authorMark Otto <otto@github.com>
Sat, 8 Feb 2014 23:37:35 +0000 (15:37 -0800)
committerMark Otto <otto@github.com>
Sat, 8 Feb 2014 23:37:35 +0000 (15:37 -0800)
commitc8315edd7397cd3b836da67d50a7c5d7eb7de90c
treea8f2a3f4e6682e540aef63dd00b6dcfb13f355ae
parenta0052b5a3745737777c88409ae08585ce75b285b
parent91b76e5247ef259b8c51672ed95dbbcfd08b7aac
Merge branch 'master' into pr/12639

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/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css