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

Trivial merge