1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 21:09:06 +02:00

Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js
This commit is contained in:
Ivan Khalopik
2013-05-07 15:16:45 +03:00
128 changed files with 9524 additions and 8257 deletions

View File

@@ -170,4 +170,4 @@
$(target).collapse(option)
})
}(window.jQuery);
}(window.jQuery);