]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into yiq-function-update
authorGijs Boddeus <botje_gijs@hotmail.com>
Thu, 5 Oct 2017 06:38:59 +0000 (08:38 +0200)
committerGitHub <noreply@github.com>
Thu, 5 Oct 2017 06:38:59 +0000 (08:38 +0200)

Trivial merge