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: 09b2a15 3e373a8)

author	Mark Otto <otto@github.com>
	Tue, 13 Aug 2013 17:36:38 +0000 (10:36 -0700)
committer	Mark Otto <otto@github.com>
	Tue, 13 Aug 2013 17:36:38 +0000 (10:36 -0700)
commit	33a88c9a94761a0371b0b3084de9009749033067
tree	041e9e0b12b2d8904ede82aebc668fa03898f522	tree \| snapshot
parent	09b2a153fc7cefeeeeb728c3ace270a32583114f	commit \| diff
parent	3e373a844c7763f513d1aec13fcd5da9d4bcd1e8	commit \| diff

Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel

Conflicts:
dist/css/bootstrap.min.css

components.html	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
javascript.html	diff1 \|	diff2 \|	blob \| history
less/mixins.less	diff1 \|	diff2 \|	blob \| history

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