]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11435
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:56:56 +0000 (16:56 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:56:56 +0000 (16:56 -0800)
commit46c3d27468accdf98dd49257f17bdc507890a1c6
tree9067b23767a152c8cb58f2a2d24bf1276e407e5b
parentaad447e29075b52a46931be17a9be4016cc89ef1
parent4c64c1eecdb52d943a50d2c181aeb915a3caed34
Merge branch 'master' into pr/11435

Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/input-groups.less