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

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

author	Jacob Thornton <jacobthornton@gmail.com>
	Tue, 3 Jan 2012 00:04:35 +0000 (16:04 -0800)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Tue, 3 Jan 2012 00:04:35 +0000 (16:04 -0800)
commit	f8c0efbcb45ba81204488b398d1d8ef2950850c6
tree	d41b2270d570ac0ee684664f84c53a1379fcfff1	tree
parent	2d092dfeea969d82bc55a153c6a597a3e87a0a03	commit \| diff
parent	553030ca7de8dac3c5180629ff84fa14173513ab	commit \| diff

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

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