]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-dev 23230/head
authorLucas Banegas <lucasconobanegas@gmail.com>
Mon, 7 Aug 2017 02:16:49 +0000 (23:16 -0300)
committerGitHub <noreply@github.com>
Mon, 7 Aug 2017 02:16:49 +0000 (23:16 -0300)

Trivial merge