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

This commit is contained in:
Julian Lam
2017-02-15 12:06:52 -05:00
113 changed files with 2486 additions and 383 deletions

View File

@@ -1,7 +1,7 @@
"use strict";
var rewardsAdmin = require('../../rewards/admin'),
SocketRewards = {};
var rewardsAdmin = require('../../rewards/admin');
var SocketRewards = module.exports;
SocketRewards.save = function (socket, data, callback) {
rewardsAdmin.save(data, callback);
@@ -11,5 +11,3 @@ SocketRewards.delete = function (socket, data, callback) {
rewardsAdmin.delete(data, callback);
};
module.exports = SocketRewards;