Merge remote-tracking branch 'origin/master'

v1.18.x
Julian Lam 11 years ago
commit c709b7ed5b

@ -8,8 +8,10 @@ var pkg = require('./../../package.json'),
var apiController = {}; var apiController = {};
apiController.getConfig = function(req, res, next) { apiController.getConfig = function(req, res, next) {
var config = require('./../../public/config.json'); var serverConfig = require('./../../config.json');
var config = {};
config.relative_path = serverConfig.relative_path;
config.version = pkg.version; config.version = pkg.version;
config.postDelay = meta.config.postDelay; config.postDelay = meta.config.postDelay;
config.minimumTitleLength = meta.config.minimumTitleLength; config.minimumTitleLength = meta.config.minimumTitleLength;

Loading…
Cancel
Save