Merge branch 'master' into rename-truffle-kredits-to-kredits-contracts

# Conflicts: # README.md # package-lock.json # package.json
2018-06-14 18:03:10 +02:00
parent 19cba53c5a e78832e2c8
commit 699ffcf911
5 changed files with 26 additions and 19 deletions
@@ -13484,7 +13484,9 @@
      }
    },
    "kredits-contracts": {
-      "version": "github:67P/kredits-contracts#8a7abba4861b8a3a73449693a8bd226bdecae553",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/kredits-contracts/-/kredits-contracts-3.0.1.tgz",
+      "integrity": "sha512-QF8j0Wu3/XTzlas4u2bmLgsCchouQH+sxM1ewnA4X16FmlbguMJfVPPnIrlX2ptmVUOXMOU+9zKy9SQquJjjqg==",
      "dev": true,
      "requires": {
        "ethers": "3.0.15",