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,6 +1,6 @@
{
"name": "kredits-contracts",
"version": "5.0.0",
"version": "5.3.0",
"description": "Ethereum contracts and npm wrapper for Kredits",
"main": "./lib/kredits.js",
"directories": {
@@ -52,8 +52,7 @@
"dependencies": {
"ethers": "^4.0.27",
"ipfs-http-client": "^30.1.1",
"kosmos-schemas": "github:67P/kosmos-schemas#feature/contribution_date_time",
"rsvp": "^4.8.2",
"kosmos-schemas": "^2.0.0",
"tv4": "^1.3.0"
},
"keywords": [