]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into patch-1 22689/head
authorHeiko Jansen <heikojansen@users.noreply.github.com>
Fri, 26 May 2017 09:07:06 +0000 (11:07 +0200)
committerGitHub <noreply@github.com>
Fri, 26 May 2017 09:07:06 +0000 (11:07 +0200)

Trivial merge