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

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

author	Mark Otto <markdotto@gmail.com>
	Mon, 23 Jan 2012 19:25:16 +0000 (11:25 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Mon, 23 Jan 2012 19:25:16 +0000 (11:25 -0800)
commit	22fa3712598f6c7d7bcff44ed5ce01f96cbc6ca6
tree	dbeda3a602dd2cb89a30ba820730c5738c420455	tree \| snapshot
parent	1209a3756c88043008950f74dd287b837e00f7d8	commit \| diff
parent	782c994060a984c10d73fdd3cc8e3fe33a2e4477	commit \| diff

Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
bootstrap.css
bootstrap.min.css
lib/type.less

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