]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12462
authorMark Otto <otto@github.com>
Sun, 9 Feb 2014 00:01:56 +0000 (16:01 -0800)
committerMark Otto <otto@github.com>
Sun, 9 Feb 2014 00:01:56 +0000 (16:01 -0800)
commite3cfd5821db94df0d6eb483d1f859da9dddd55a8
tree8af2dc5a1442b8974ecc7809ca516f2c67fde39b
parent08ff305ed7ba689238d4524b0285d37d15aaf8fa
parent842af44fccb338f165eb2ea64bdaffd999850881
Merge branch 'master' into pr/12462

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
less/panels.less