Bump to v4.6.0.

This commit is contained in:
John-David Dalton
2016-02-29 23:41:02 -08:00
parent 9055c4e483
commit 7da4c55415
65 changed files with 413 additions and 235 deletions

View File

@@ -15,8 +15,7 @@ import isObject from './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;
}