Merge branch 'master' into refactor/healthcheck

This commit is contained in:
2018-04-22 14:33:22 +00:00
committed by GitHub
2 changed files with 4 additions and 3 deletions
+3 -3
View File
@@ -13456,7 +13456,7 @@
} }
}, },
"kredits-contracts": { "kredits-contracts": {
"version": "github:67P/truffle-kredits#ee886e6cd08e2d7ef0c3e1c5952a15c918d20224", "version": "github:67P/truffle-kredits#1779d66ee60c03db1f5d58bf06229f34edcce8c5",
"dev": true, "dev": true,
"requires": { "requires": {
"ethers": "3.0.15", "ethers": "3.0.15",
@@ -20560,7 +20560,7 @@
}, },
"slash": { "slash": {
"version": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", "version": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
"dev": true "dev": true
}, },
"slice-ansi": { "slice-ansi": {
@@ -21533,7 +21533,7 @@
}, },
"trim-right": { "trim-right": {
"version": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", "version": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
"dev": true "dev": true
}, },
"true-case-path": { "true-case-path": {
+1
View File
@@ -13,6 +13,7 @@
"scripts": { "scripts": {
"lint:js": "eslint ./*.js app config lib server tests", "lint:js": "eslint ./*.js app config lib server tests",
"start": "ember serve", "start": "ember serve",
"kovan": "NETWORK_ID=42 ember serve",
"test": "ember test", "test": "ember test",
"build": "ember build", "build": "ember build",
"build-prod": "ember build --environment production", "build-prod": "ember build --environment production",