]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 14 Oct 2013 18:06:25 +0000 (11:06 -0700)
committerMark Otto <otto@github.com>
Mon, 14 Oct 2013 18:06:25 +0000 (11:06 -0700)
commit6307d2c94d879e802610e366087bff75883d70a4
tree1c43da1bf8d67c1fff25fe19033451176cd56ee3
parent1f5c754d576f9534da2cc2176bf2193d31ed6937
parent70278a4e4f6c2e9079d72a2993b69efd3a965ba0
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
getting-started.html
getting-started.html