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: 0615142 2e91843)

author	Mark Otto <otto@github.com>
	Mon, 19 Aug 2013 03:11:04 +0000 (20:11 -0700)
committer	Mark Otto <otto@github.com>
	Mon, 19 Aug 2013 03:11:04 +0000 (20:11 -0700)
commit	a1db2d7a5ee452ee272f0d040aceec6f947a8b75
tree	124eb3d18c886b08b725a2b6e0c41c44c3abcff0	tree \| snapshot
parent	0615142834343af8c40cd7ad47c498431745f080	commit \| diff
parent	2e9184366129139bb9b64b679a0e75a3c556465e	commit \| diff

Merge branch '3.0.0-wip' into bs3_panel_base_class

Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css

components.html	diff1 \|	diff2 \|	blob \| history
customize.html	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap-theme.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap-theme.min.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
examples/theme/index.html	diff1 \|	diff2 \|	blob \| history
less/theme.less	diff1 \|	diff2 \|	blob \| history
less/variables.less	diff1 \|	diff2 \|	blob \| history

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