]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 15 Nov 2015 03:52:17 +0000 (19:52 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 15 Nov 2015 03:52:17 +0000 (19:52 -0800)

Trivial merge