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: e23906f efac0bf)

author	Mark Otto <otto@github.com>
	Mon, 5 Aug 2013 19:20:52 +0000 (12:20 -0700)
committer	Mark Otto <otto@github.com>
	Mon, 5 Aug 2013 19:20:52 +0000 (12:20 -0700)
commit	96136dbb56e136278cc7084caf84291949925d0c
tree	6db39936e8b632420f5a322f70035ab4a991b470	tree \| snapshot
parent	e23906facaa63fcc97bddbd0895c301699c9e942	commit \| diff
parent	efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8	commit \| diff

Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright

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
less/navs.less	diff1 \|	diff2 \|	blob \| history
less/type.less	diff1 \|	diff2 \|	blob \| history

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