Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into notifications

Browse Source 
Conflicts:
	src/webserver.js
This commit is contained in:
Julian Lam
2013-05-23 13:24:27 -04:00
parent 78713f0599 cd4ca110a1
commit 1f7ab82f78
12 changed files with 129 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/webserver.js
View File

@@ -7,6 +7,7 @@ var express = require('express'),
redis = require('redis'),
redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
marked = require('marked'),
utils = require('./../public/src/utils.js'),
fs = require('fs'),
user = require('./user.js'),
@@ -14,7 +15,6 @@ var express = require('express'),
posts = require('./posts.js'),
topics = require('./topics.js'),
notifications = require('./notifications.js'),
utils = require('./utils.js'),
admin = require('./routes/admin.js'),
userRoute = require('./routes/user.js'),
auth = require('./routes/authentication.js');