]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Sun, 30 Nov 2014 09:32:03 +0000 (01:32 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 30 Nov 2014 09:32:03 +0000 (01:32 -0800)

Trivial merge