git.ipfire.org Git - thirdparty/bootstrap.git/commit

]> git.ipfire.org Git - thirdparty/bootstrap.git/commit

author	Mark Otto <markdotto@gmail.com>
	Wed, 30 Nov 2011 06:53:12 +0000 (22:53 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Wed, 30 Nov 2011 06:53:12 +0000 (22:53 -0800)
commit	8f3150cf7158d3d949e59fed44112350c0724b74
tree	04e5a08ac29b8875ea71a8749fb8a85a2bcc4175	tree \| snapshot
parent	cbb291b8ab316c3c0103da3c7b7a2c73596cfef2	commit \| diff
parent	1da19bf65f9affec06ba6e1f6e5f545a8e2ea457	commit \| diff

Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix

Conflicts:
bootstrap.css

Mirror of https://github.com/twbs/bootstrap.git