From: billy gates Date: Fri, 7 Dec 2012 22:11:18 +0000 (-0800) Subject: Merge pull request #6118 from godric7/master X-Git-Tag: v2.2.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2526c3fdbeb67732400b5cd5fce8d64de1eeee1a;p=thirdparty%2Fbootstrap.git Merge pull request #6118 from godric7/master scrollSpy - add parent scrollTop to offset calculation --- 2526c3fdbeb67732400b5cd5fce8d64de1eeee1a