Merge branch 'master' of github.com:designcreateplay/NodeBB

This commit is contained in:
Julian Lam
2013-09-18 07:23:50 -04:00
19 changed files with 151 additions and 121 deletions

View File

@@ -5,7 +5,8 @@ var user = require('./../user.js'),
utils = require('./../../public/src/utils.js'),
pkg = require('../../package.json'),
meta = require('./../meta.js'),
path = require('path');
path = require('path'),
nconf = require('nconf');
(function(Api) {