]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into colors-redux
authorMark Otto <markd.otto@gmail.com>
Fri, 30 Jun 2017 15:33:09 +0000 (08:33 -0700)
committerGitHub <noreply@github.com>
Fri, 30 Jun 2017 15:33:09 +0000 (08:33 -0700)

Trivial merge