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

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

author	Mark Otto <markdotto@gmail.com>
	Sat, 7 Jan 2012 21:52:36 +0000 (13:52 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Sat, 7 Jan 2012 21:52:36 +0000 (13:52 -0800)
commit	418e2c7d58d9fc6a126a58427b14a2cf68f97423
tree	a9b427a23796162fd8ec3a79e85023931b2970ec	tree
parent	b81b0e2b15abf4068f55d0055a10c8f5a16aece8	commit \| diff
parent	3eb80591b2c8bb2850caf27da7d6b8c8b747063a	commit \| diff

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

Conflicts:
bootstrap.css

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