]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into patch-1 23923/head
authorJohann-S <johann.servoire@gmail.com>
Tue, 12 Sep 2017 08:45:06 +0000 (10:45 +0200)
committerGitHub <noreply@github.com>
Tue, 12 Sep 2017 08:45:06 +0000 (10:45 +0200)

Trivial merge