]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12388
authorMark Otto <otto@github.com>
Thu, 30 Jan 2014 06:18:29 +0000 (22:18 -0800)
committerMark Otto <otto@github.com>
Thu, 30 Jan 2014 06:18:29 +0000 (22:18 -0800)
commitd2f1887bb5e7b651b11d6dd22ce191c733717a83
tree18aec6ab68ae29013e85a4a184baf33afa346769
parente38fd138ce04d73e03100a3ea42496fc914120e9
parent9195d8e8eb51208e4272e4c7e0851e2695da1a0d
Merge branch 'master' into pr/12388

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