]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into gh-pages
authorMark Otto <otto@github.com>
Wed, 30 Oct 2013 16:00:29 +0000 (09:00 -0700)
committerMark Otto <otto@github.com>
Wed, 30 Oct 2013 16:00:29 +0000 (09:00 -0700)
commitf4854301d2a1ead2ada842a5a84f224422a7c71d
tree67ad8f36dc10ea349db94b72bf55ed7093d93f08
parentb79a2b3b7ef871b6f146977c399f4c6a01f13644
parent147837efaa48696debf93c62e8d872f72d866117
Merge branch 'master' into gh-pages

Conflicts:
_layouts/home.html
assets/css/docs.css