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: 70b0fb4 ef60b0e)

author	Mark Otto <otto@github.com>
	Thu, 15 Aug 2013 05:59:02 +0000 (22:59 -0700)
committer	Mark Otto <otto@github.com>
	Thu, 15 Aug 2013 05:59:02 +0000 (22:59 -0700)
commit	c5ca743cb7a3e4ca17979854f35d21d91a7b6ef7
tree	df8bfd46f9f726c545ce879c82ede280427d6a66	tree
parent	70b0fb445ee373811ea952a0936493c4f574fba2	commit \| diff
parent	ef60b0e5fbccbd16b964c1397a7f4cc4c9b51663	commit \| diff

Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin

Conflicts:
dist/css/bootstrap.min.css

dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
less/navbar.less	diff1 \|	diff2 \|	blob \| history

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