Merge branch 'master' into chore/linter

# Conflicts:
#	lib/contracts/contribution.js
#	lib/contracts/contributor.js
#	lib/contracts/proposal.js
#	lib/kredits.js
#	lib/serializers/contributor.js
#	yarn.lock
This commit is contained in:
2019-04-24 19:12:18 +02:00
31 changed files with 32965 additions and 120 deletions

View File

@@ -1,5 +1,4 @@
const ethers = require('ethers');
const RSVP = require('rsvp');
const Preflight = require('./utils/preflight');
@@ -57,7 +56,8 @@ class Kredits {
);
});
});
return RSVP.all(addressPromises).then(() => { return this; });
return Promise.all(addressPromises).then(() => { return this });
});
}