]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Sat, 21 Dec 2013 19:17:29 +0000 (11:17 -0800)
committerMark Otto <otto@github.com>
Sat, 21 Dec 2013 19:17:29 +0000 (11:17 -0800)
commit02c40ab9919ee87ec8f7688133cc71f64f460013
tree350491788234da822d8fc9dfcaf6c31b7599cdcc
parent07705673b6398ae9cfe2cb59b97d61e04efeb8bf
parent5f9695ae7cf66dd7f07a3cb3eb534e838d18c62b
Merge branch 'master' into docs_derp

Conflicts:
_layouts/default.html
components.html
_includes/footer.html
components.html
css.html