]> 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>
Sun, 30 Oct 2016 21:48:42 +0000 (14:48 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 30 Oct 2016 21:48:42 +0000 (14:48 -0700)

Trivial merge