]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 03:10:19 +0000 (20:10 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 03:10:19 +0000 (20:10 -0700)

Trivial merge