Merge branch 'develop' into party-chat-translations

# Conflicts:
#	test/api/unit/models/group.test.js
This commit is contained in:
Mateus Etto
2018-06-20 20:24:38 +09:00
799 changed files with 42207 additions and 31980 deletions

View File

@@ -81,7 +81,7 @@ api.inviteToQuest = {
'party._id': group._id,
_id: {$ne: user._id},
})
.select('auth.facebook auth.local preferences.emailNotifications profile.name pushDevices')
.select('auth.facebook auth.google auth.local preferences.emailNotifications profile.name pushDevices')
.exec();
group.markModified('quest');