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: a46003b 727a91d)

author	Mark Otto <otto@github.com>
	Mon, 14 Oct 2013 01:32:34 +0000 (18:32 -0700)
committer	Mark Otto <otto@github.com>
	Mon, 14 Oct 2013 01:32:34 +0000 (18:32 -0700)
commit	265fda7903e189ee0d2d7201cc92bf384fc53043
tree	cf2249e0696d6ea2923678f9f7b155e265756f03	tree
parent	a46003b8c7cc20bf4f72b7638a74643353ae047f	commit \| diff
parent	727a91de1cdf5cbc4f25528e073480332a5940c5	commit \| diff

Merge branch 'master' into restore_grid_mixins

Conflicts:
dist/css/bootstrap.min.css

_includes/header.html	diff1 \|	diff2 \|	blob \| history
customize.html	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
docs-assets/css/docs.css	diff1 \|	diff2 \|	blob \| history

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