aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app.js
diff options
context:
space:
mode:
authorErling Aaby <erlinaa@stud.hist.no>2013-04-30 13:45:06 +0200
committerErling Aaby <erlinaa@stud.hist.no>2013-04-30 13:45:06 +0200
commit546dabe8f94dd96125a611587f8197d49a36f16a (patch)
tree746eec12b95268f41b992d2002e19bbc1f5c0f94 /app.js
parentchanges in use.less (diff)
parentremoved old router (diff)
downloadDivid-546dabe8f94dd96125a611587f8197d49a36f16a.tar.gz
Merge branch 'master' of github.com:dennisse/Divid
Diffstat (limited to 'app.js')
-rw-r--r--app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app.js b/app.js
index 492f8fe..618ef8d 100644
--- a/app.js
+++ b/app.js
@@ -10,7 +10,7 @@ var express = require('express')
/**
* App configuration
*/
-var port = process.env.PORT || 8001
+var port = process.env.PORT || 8000
, env = process.env.NODE_ENV || 'development'
, config = require('./config/config')[env]
, auth = require('./config/middlewares/authorization');
@@ -44,7 +44,7 @@ require('./config/express')(app, config, passport);
/**
* Routes
*/
-require('./router')(app, passport, auth);
+require('./routes')(app, passport, auth);
/**