Merge branch 'master' into ui

This commit is contained in:
Danny Coates 2017-06-21 09:48:52 -07:00 committed by GitHub
commit 0015b3c0c6
8 changed files with 893 additions and 447 deletions

View file

@ -20,7 +20,7 @@ const conf = convict({
format: 'port',
default: 1443,
arg: 'port',
env: 'P2P_LISTEN_PORT'
env: 'PORT'
},
env: {
format: ['production', 'development', 'test'],