]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d73d9c ed5dbf1)
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap...
authorfat <jacobthornton@gmail.com>
Mon, 30 Dec 2013 02:04:43 +0000 (18:04 -0800)
committerfat <jacobthornton@gmail.com>
Mon, 30 Dec 2013 02:04:43 +0000 (18:04 -0800)
commit162d9e1776ef55d741ffc80f8694c16c40de32ca
tree640fc798a0fd8de15f0027f4690885c569f1f654tree | snapshot
parent9d73d9c38c440b4863a991da7995a10ae1023b57commit | diff
parented5dbf1b2b8187b6939ab10d75573118d346f970commit | diff
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

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