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

This commit is contained in:
Julian Lam
2017-04-12 23:57:14 -04:00
226 changed files with 211 additions and 10501 deletions

View File

@@ -5,7 +5,7 @@ var S = require('string');
var db = require('../database');
var user = require('../user');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Messaging) {
Messaging.newMessageCutoff = 1000 * 60 * 3;