Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset

Browse Source

Conflicts:
	js/tests/unit/carousel.js

...

This commit is contained in:

fat

2013-12-24 12:50:55 -08:00

parent 0a75e4c09b ed1bd2b150

commit fe7fffe034

5 changed files with 40 additions and 19 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

2

docs-assets/js/raw-files.js

File diff suppressed because one or more lines are too long