Merge branch 'develop' into party-chat-translations

# Conflicts: # website/server/controllers/api-v3/user.js
2025-12-15 13:47:33 +01:00 · 2018-02-26 19:55:32 +09:00
parent 649404ac6a 01dab33b96
commit d2fcdf4493
774 changed files with 18976 additions and 16904 deletions
--- a/website/server/controllers/api-v3/quests.js
+++ b/website/server/controllers/api-v3/quests.js
@@ -79,8 +79,8 @@ api.inviteToQuest = {
      'party._id': group._id,
      _id: {$ne: user._id},
    })
-    .select('auth.facebook auth.local preferences.emailNotifications profile.name pushDevices')
-    .exec();
+      .select('auth.facebook auth.local preferences.emailNotifications profile.name pushDevices')
+      .exec();

    group.markModified('quest');
    group.quest.key = questKey;