merge with master and resolve more conflicts
This commit is contained in:
commit
a5604aedb7
19 changed files with 322 additions and 87 deletions
2
test/unit/effects.js
vendored
2
test/unit/effects.js
vendored
|
@ -807,7 +807,7 @@ jQuery.checkState = function(){
|
|||
jQuery.removeData(this, "olddisplay", true);
|
||||
|
||||
start();
|
||||
}
|
||||
};
|
||||
|
||||
// Chaining Tests
|
||||
test("Chain fadeOut fadeIn", function() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue