1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +02:00

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto
2013-05-22 21:51:54 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -1088,7 +1088,7 @@
this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value
}, this)
})
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type)

File diff suppressed because one or more lines are too long