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

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

author	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 8 Aug 2013 06:10:11 +0000 (23:10 -0700)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 8 Aug 2013 06:10:11 +0000 (23:10 -0700)
commit	89b69ed77035eeb9c0034534d75fdb2062f10d47
tree	99b1f65ee730de94e64b4992e5131f0432743b1e	tree \| snapshot
parent	b35b65d0b3689f7999be998411e632046548af6e	commit \| diff
parent	f3104a3e3b04c2817094ef8ebd351833a4ade420	commit \| diff

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
_layouts/customize.html

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