Merge branch '2.4' into 2
This commit is contained in:
commit
ae9dbddfb0
|
@ -129,6 +129,7 @@
|
||||||
if (typeof console !== 'undefined') {
|
if (typeof console !== 'undefined') {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
}
|
}
|
||||||
|
self.buttonReset();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,4 +42,4 @@
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
Loading…
Reference in New Issue