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

7
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "kredits-contracts",
"version": "5.0.0",
"version": "5.3.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -11776,8 +11776,9 @@
}
},
"kosmos-schemas": {
"version": "github:67P/kosmos-schemas#28a5e9f1fc2e083165e4e02ce3361c3f4fafa592",
"from": "github:67P/kosmos-schemas#feature/contribution_date_time",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/kosmos-schemas/-/kosmos-schemas-2.0.0.tgz",
"integrity": "sha512-zIjWcDxaN94m1vPgUaI5LRX6y07Ihw9ScPoGKf1NkZ0sLgD/CRV8YIKRyDafH5mThe3uBN2+F6H6Gp5qhNhALg==",
"requires": {
"brfs-babel": "^1.0.0"
}