]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge remote-tracking branch 'twbs/v4-dev' into v4-dev
authorPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Tue, 2 Aug 2016 05:35:38 +0000 (01:35 -0400)
committerPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Tue, 2 Aug 2016 05:35:38 +0000 (01:35 -0400)

Trivial merge