]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'mikegreiling-scrollspy-update'
authorChris Rebert <code@rebertia.com>
Sun, 8 Jun 2014 01:27:32 +0000 (18:27 -0700)
committerChris Rebert <code@rebertia.com>
Sun, 8 Jun 2014 01:27:32 +0000 (18:27 -0700)

Trivial merge