]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4' of github.com:twbs/derpstrap into v4
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 13 Aug 2015 04:12:23 +0000 (21:12 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 13 Aug 2015 04:12:23 +0000 (21:12 -0700)

Trivial merge