]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Wed, 15 Jan 2014 21:08:35 +0000 (13:08 -0800)
committerMark Otto <otto@github.com>
Wed, 15 Jan 2014 21:08:35 +0000 (13:08 -0800)
commita633fc042d4060499964fca7333edc5ac55cde4b
tree4422ee5ec858137d5b07a34e662dd1c493a6f06b
parentcae63200d8a645f385349debd940666ddbca0b38
parent1facbf6e7a32cfb1334e9c84a59c762c27f13cb5
Merge branch 'master' into docs_derp

Conflicts:
docs/components.html
docs/css.html
docs/components.html
docs/css.html