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: ffbec23 1b814dd)

author	Mark Otto <otto@github.com>
	Sat, 17 Aug 2013 21:16:40 +0000 (14:16 -0700)
committer	Mark Otto <otto@github.com>
	Sat, 17 Aug 2013 21:16:40 +0000 (14:16 -0700)
commit	441e04c84a8a5dd4f55aad61c35c54aded41cc1d
tree	19ffb09d1f884c897f2ea32c39244954eaab02ca	tree
parent	ffbec23c982de7496743212afb8d75005e52199c	commit \| diff
parent	1b814ddd0a5768ff8ee85bef28f026e06fbace93	commit \| diff

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
dist/css/bootstrap.min.css
getting-started.html

_layouts/home.html	diff1 \|	diff2 \|	blob \| history
assets/css/docs.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
getting-started.html	diff1 \|	diff2 \|	blob \| history
less/navbar.less	diff1 \|	diff2 \|	blob \| history

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