]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 23 Jun 2014 01:04:28 +0000 (18:04 -0700)
committerMark Otto <otto@github.com>
Mon, 23 Jun 2014 01:04:28 +0000 (18:04 -0700)

Trivial merge