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

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

author	Jacob Thornton <jacobthornton@gmail.com>
	Wed, 21 Dec 2011 22:03:18 +0000 (14:03 -0800)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Wed, 21 Dec 2011 22:03:18 +0000 (14:03 -0800)
commit	a5a98a8a984512011dac1216b432b86c6eff96a4
tree	15d14c92a97a0179a0501d8457edc97008a18d91	tree
parent	80cb760fac507ce207a6174f8886417d32d4b5ed	commit \| diff
parent	069ef6a020dc177bbf4e18a9b425af36b3395ecf	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