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: 12980e7 201088c)

author	Mark Otto <otto@github.com>
	Fri, 27 Dec 2013 05:40:15 +0000 (21:40 -0800)
committer	Mark Otto <otto@github.com>
	Fri, 27 Dec 2013 05:40:15 +0000 (21:40 -0800)
commit	5b02dbd97a0a480b0f800cb1011089dab9980300
tree	7eb7ffdc3bf67d303b95ab2ab05bfbf3f76503d1	tree \| snapshot
parent	12980e7ea47057d7e17c3606604c79c6450b272e	commit \| diff
parent	201088cb5f9ab4af062b62ac3a10a2e8f07a6ec5	commit \| diff

Merge branch 'master' into docs_derp

Conflicts:
_config.yml

_config.yml	diff1 \|	diff2 \|	blob \| history
_includes/nav-css.html	diff1 \|	diff2 \|	blob \| history
_layouts/default.html	diff1 \|	diff2 \|	blob \| history
about.html	diff1 \|	diff2 \|	blob \| history
components.html	diff1 \|	diff2 \|	blob \| history
css.html	diff1 \|	diff2 \|	blob \| history
docs-assets/css/docs.css	diff1 \|	diff2 \|	blob \| history
docs-assets/js/application.js	diff1 \|	diff2 \|	blob \| history
getting-started.html	diff1 \|	diff2 \|	blob \| history

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