]> 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 05:18:46 +0000 (22:18 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 05:18:46 +0000 (22:18 -0700)

Trivial merge