Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

Browse Source

Conflicts:
	dist/js/bootstrap.min.js

...

This commit is contained in:

fat

2013-12-29 18:04:43 -08:00

parent 9d73d9c38c ed5dbf1b2b

commit 162d9e1776

3 changed files with 11 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

dist/js/bootstrap.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long