]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'twbs/v4-dev' into v4-dev
authorPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Thu, 20 Oct 2016 18:25:00 +0000 (14:25 -0400)
committerPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Thu, 20 Oct 2016 18:25:00 +0000 (14:25 -0400)

Trivial merge