]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
authorMark Otto <markdotto@gmail.com>
Fri, 28 Oct 2016 02:56:55 +0000 (19:56 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 28 Oct 2016 02:56:55 +0000 (19:56 -0700)

Trivial merge