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

@@ -11,7 +11,7 @@ var privileges = require('../privileges');
var plugins = require('../plugins');
var cache = require('./cache');
var pubsub = require('../pubsub');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Posts) {
pubsub.on('post:edit', function (pid) {