From 6a1fd98a5bb5300aca745aea24edb29c0fbfcae2 Mon Sep 17 00:00:00 2001 From: Denis Ciccale Date: Mon, 6 Apr 2015 22:50:44 +0200 Subject: [PATCH] fix server config options merge --- app/templates/server/config/environment/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/server/config/environment/index.js b/app/templates/server/config/environment/index.js index 11d85f4de..bbee510f8 100644 --- a/app/templates/server/config/environment/index.js +++ b/app/templates/server/config/environment/index.js @@ -64,4 +64,4 @@ var all = { // ============================================== module.exports = _.merge( all, - require('./' + process.env.NODE_ENV + '.js') || {}); \ No newline at end of file + all.env ? require('./' + all.env + '.js') : {});