Bump to v4.6.0.

This commit is contained in:
John-David Dalton
2016-02-29 23:38:21 -08:00
parent 65e5d998b3
commit 8166b65853
62 changed files with 726 additions and 416 deletions

View File

@@ -17,8 +17,7 @@ define(['./_baseMerge', './isObject'], function(baseMerge, isObject) {
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack.set(srcValue, objValue));
}
return objValue;
}