]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)
committerMark Otto <otto@github.com>
Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)
commitcae63200d8a645f385349debd940666ddbca0b38
tree280892d40cdbbc10b8e3937028a9bc933a4b266c
parentedd0b97be521346da0cdd39573914d9b9902167b
parent8fb75ee9e78ecb0954e1634ab85e91d533d0ab42
Merge branch 'master' into docs_derp

Conflicts:
docs/_includes/old-bs-docs.html