Merge branch 'master' of github.com:typpo/textbelt

This commit is contained in:
Ian Webster 2014-04-08 19:28:51 -07:00
commit c3d41906df
2 changed files with 3 additions and 7 deletions

8
app.js
View File

@ -1,5 +1,5 @@
var express = require('express')
, app = express.createServer()
, app = express()
, _ = require('underscore')
, fs = require('fs')
, mixpanel = require('mixpanel')
@ -10,11 +10,7 @@ var express = require('express')
var mpq = new mixpanel.Client('6e6e6b71ed5ada4504c52d915388d73d');
var redis;
if (process.env.NODE_ENV == 'production')
redis = require('redis-url').connect(process.env.REDISTOGO_URL);
else
redis = require('redis-url').connect();
var redis = require('redis-url').connect();
// Express config
app.set('views', __dirname + '/views');

View File

@ -1,7 +1,7 @@
{
"name": "TextBelt"
, "dependencies": {
"express": "2.5.2"
"express": "latest"
, "jade": "0.14.2"
, "nodemailer": "latest"
, "redis-url": "latest"