]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c08e275 7627b24)
Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil...
authorfat <jacobthornton@gmail.com>
Sun, 6 Jul 2014 21:11:23 +0000 (14:11 -0700)
committerfat <jacobthornton@gmail.com>
Sun, 6 Jul 2014 21:11:23 +0000 (14:11 -0700)
commitb19719ea1af17aafc18cd2dd8963a95498cb1d20
treea2e052994f65bd7819c0967bb538eaa874cea1a2tree
parentc08e275000330db6d8883de6af2243216cc79837commit | diff
parent7627b24c1e6aa5301ee3f525dd931c2852e7ff0acommit | diff
Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test

Conflicts:
js/tests/unit/scrollspy.js
js/tests/unit/scrollspy.js diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git