]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into patch-5 23671/head
authorJohann-S <johann.servoire@gmail.com>
Sat, 2 Sep 2017 17:31:12 +0000 (19:31 +0200)
committerGitHub <noreply@github.com>
Sat, 2 Sep 2017 17:31:12 +0000 (19:31 +0200)

Trivial merge