Manuel Wiedenmann 145b3ea766 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

2019-04-24 19:12:18 +02:00

..

contribution.js

Fix linter errors

2019-04-13 00:08:12 +02:00

contributor.js

Merge branch 'master' into chore/linter

2019-04-24 19:12:18 +02:00