Merge branch 'master' of https://github.com/designcreateplay/NodeBB into akhoury-topics-thumbnails

This commit is contained in:
Baris Soner Usakli
2014-02-21 23:15:38 -05:00

View File

@@ -6,6 +6,7 @@ var fs = require('fs'),
translator = require('../public/src/translator'),
utils = require('./../public/src/utils'),
translator = require('./../public/src/translator'),
db = require('./database'),
plugins = require('./plugins'),
User = require('./user');
@@ -61,7 +62,6 @@ var fs = require('fs'),
// this might be a good spot to add a hook
if (field === 'defaultLang') {
var translator = require('../public/src/translator');
translator.loadServer();
}
});