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

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

projects / thirdparty / bootstrap.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cec89e2 0067399)

author	Mark Otto <otto@github.com>
	Fri, 6 Sep 2013 16:11:26 +0000 (09:11 -0700)
committer	Mark Otto <otto@github.com>
	Fri, 6 Sep 2013 16:11:26 +0000 (09:11 -0700)
commit	394161f281fc643d2f2ab7b7064972310730e018
tree	b8cd3a898ae9441f47f8ed88ad5c1452db79cf99	tree \| snapshot
parent	cec89e20a92c3895421b4b79339be59e2764c2fe	commit \| diff
parent	00673991af034e2a0da03f72ac95683cea66e60d	commit \| diff

Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack-GSEdits7

Conflicts:
getting-started.html

getting-started.html

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