Merge branch 'master' into status-history

This commit is contained in:
Wyatt Johnson
2016-12-06 11:08:00 -05:00
committed by GitHub
25 changed files with 632 additions and 164 deletions
+2 -1
View File
@@ -17,7 +17,8 @@ const util = require('../util');
/**
* Get port from environment and store in Express.
*/
const port = normalizePort(process.env.TALK_PORT || '3000');
const port = normalizePort(process.env.TALK_PORT || (process.env.NODE_ENV === 'test' ? '3011' : '3000'));
app.set('port', port);