dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-06 19:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpack build for branch master: e57bfc9313

Browse source
This commit is contained in:
Travis CI 2017-07-04 01:50:11 +00:00
parent 3e480ee4d8
commit 10daef809d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
discord.master.js
View file

@ -1301,7 +1301,7 @@ class Util {
static mergeDefault(def, given) { static mergeDefault(def, given) {
if (!given) return def; if (!given) return def;
for (const key in def) { for (const key in def) {
if (!{}.hasOwnProperty.call(given, key)) { if (!{}.hasOwnProperty.call(given, key) && def[key] !== undefined) {
given[key] = def[key]; given[key] = def[key];
} else if (given[key] === Object(given[key])) { } else if (given[key] === Object(given[key])) {
given[key] = this.mergeDefault(def[key], given[key]); given[key] = this.mergeDefault(def[key], given[key]);

2
discord.master.min.js vendored
View file

File diff suppressed because one or more lines are too long