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

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

author	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 12 Jan 2012 05:43:43 +0000 (21:43 -0800)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 12 Jan 2012 05:43:43 +0000 (21:43 -0800)
commit	19090ea33322e9d4309497f838f8627ca21734bf
tree	7f1010c2f6af8ecf3c13c149925e08ce688aeac5	tree
parent	6f2f947a4309a8fdeb7067612447c0f1a15dcfd9	commit \| diff
parent	a2ebf0c0c1381c38dda24bf12aebd5f9b4907e06	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