]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into custom-check-disabled
authorGijs Boddeus <botje_gijs@hotmail.com>
Wed, 10 Jan 2018 20:49:10 +0000 (21:49 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2018 20:49:10 +0000 (21:49 +0100)

Trivial merge