Merge remote-tracking branch 'rochoa/master'

This commit is contained in:
Raul Ochoa 2014-04-22 11:40:48 +02:00
commit d2f0180475

4
app.js
View File

@ -21,9 +21,7 @@ if (ENV != 'development' && ENV != 'production' && ENV != 'staging' ){
process.exit(1);
}
var _ = require('underscore')
, Step = require('step')
;
var _ = require('underscore');
// set environment specific variables
global.environment = require(__dirname + '/config/environments/' + ENV);