Merge branch 'master' into notif-abort

This commit is contained in:
Peter Jaszkowiak
2017-05-09 11:31:58 -06:00
committed by GitHub
776 changed files with 9680 additions and 5060 deletions

View File

@@ -79,6 +79,7 @@ module.exports = function (Messaging) {
}
notifications.create({
type: 'new-chat',
bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
bodyLong: messageObj.content,
nid: 'chat_' + fromuid + '_' + roomId,