]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of https://github.com/twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Wed, 5 Aug 2015 03:35:12 +0000 (20:35 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 5 Aug 2015 03:35:12 +0000 (20:35 -0700)

Trivial merge