]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11614
authorMark Otto <otto@github.com>
Thu, 28 Nov 2013 19:57:12 +0000 (11:57 -0800)
committerMark Otto <otto@github.com>
Thu, 28 Nov 2013 19:57:12 +0000 (11:57 -0800)
commitb7b72cc8773b88d4ba23a84847e93fb9e8d3e1bb
treed58ecfd74b18ee7f1183e3e301ec519c00494bcc
parentbff8ba2b794305842d7a712a1bf6e400b898b7c0
parent56f4cf0316b03af888c22c62e4ef24e437b4a370
Merge branch 'master' into pr/11614

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css