diff options
| author | fat <[email protected]> | 2013-12-24 12:50:55 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-24 12:50:55 -0800 |
| commit | fe7fffe034f8a97aae004351ee46fe9a704a971e (patch) | |
| tree | 057217fcc2a4dd86ad02f26234d9e5a6784c739f /javascript.html | |
| parent | 0a75e4c09b77035e9492006647da8d1900d24f75 (diff) | |
| parent | ed1bd2b150dd645c11f92126a12183985ddbbc15 (diff) | |
| download | bootstrap-fe7fffe034f8a97aae004351ee46fe9a704a971e.tar.xz bootstrap-fe7fffe034f8a97aae004351ee46fe9a704a971e.zip | |
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
js/tests/unit/carousel.js
Diffstat (limited to 'javascript.html')
0 files changed, 0 insertions, 0 deletions