]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Wed, 25 Feb 2015 00:43:22 +0000 (16:43 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Feb 2015 00:43:22 +0000 (16:43 -0800)

Trivial merge