Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-02-07 15:45:21 -05:00
117 changed files with 1945 additions and 1700 deletions

View File

@@ -57,7 +57,7 @@ SocketAdmin.reload = function (socket, data, callback) {
};
SocketAdmin.restart = function (socket, data, callback) {
require('../../build').buildAll(function (err) {
require('../meta/build').buildAll(function (err) {
if (err) {
return callback(err);
}