Merge branch 'master' into bulk-approve-reject-actions

This commit is contained in:
Kiwi
2017-10-23 19:29:24 +02:00
committed by GitHub
+1 -1
View File
@@ -119,7 +119,7 @@ const CONFIG = {
//------------------------------------------------------------------------------
// Port to bind to.
PORT: process.env.TALK_PORT || process.env.PORT || process.env.NODE_ENV === 'test' ? '3001' : '3000',
PORT: process.env.TALK_PORT || process.env.PORT || (process.env.NODE_ENV === 'test' ? '3001' : '3000'),
// The URL for this Talk Instance as viewable from the outside.
ROOT_URL: process.env.TALK_ROOT_URL || null,