Skip to content

Commit

Permalink
change: allow custom property on config
Browse files Browse the repository at this point in the history
  • Loading branch information
justLuiz committed Oct 1, 2019
1 parent 85c9d4f commit 1e8f9a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/core/mergeConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function mergeConfig(config1, config2) {
'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress',
'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent',
'httpsAgent', 'cancelToken', 'socketPath'
'httpsAgent', 'cancelToken', 'socketPath', 'custom'
];

utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
Expand Down

0 comments on commit 1e8f9a6

Please sign in to comment.