]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into patch-5
authorJohann-S <johann.servoire@gmail.com>
Tue, 29 Aug 2017 19:32:52 +0000 (21:32 +0200)
committerGitHub <noreply@github.com>
Tue, 29 Aug 2017 19:32:52 +0000 (21:32 +0200)

Trivial merge