From a454af4d4cddd28d28c4f67d0ca5ef06f0e13b02 Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Thu, 11 May 2023 19:48:56 +0000
Subject: [PATCH 1/3] chore: incrementing version number - v3.1.1

---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index bb5f9211d3..5bb5361676 100644
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",

From ccd6f48c02a0168410885c912c81a512c21895bb Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Thu, 11 May 2023 19:48:56 +0000
Subject: [PATCH 2/3] chore: update changelog for v3.1.1

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e14609633..02db5f4bac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+#### v3.1.1 (2023-05-11)
+
+##### Chores
+
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  update changelog for v3.1.0 (2c515dc3)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### Documentation Changes
+
+*  updating changelog to move line re: breaking change down to new features (b259a000)
+
+##### Bug Fixes
+
+*  failing test case (3251bca2)
+*  #11589, regression where a user could not confirm their email if requireEmailAddress was enabled (686ecea1)
+
 #### v3.1.0 (2023-05-10)
 
 ##### Chores

From 28740de766f5178802400700b4db6f793371c642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 12 May 2023 09:40:39 -0400
Subject: [PATCH 3/3] fix: #11595, use default value

---
 src/controllers/admin/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js
index 3255680a1e..e0b3e9b6da 100644
--- a/src/controllers/admin/settings.js
+++ b/src/controllers/admin/settings.js
@@ -111,7 +111,7 @@ settingsController.social = async function (req, res) {
 };
 
 settingsController.api = async (req, res) => {
-	const { tokens } = await meta.settings.get('core.api');
+	const { tokens = [] } = await meta.settings.get('core.api');
 	const scores = await api.utils.getLastSeen(tokens.map(t => t.token));
 
 	const [lastSeen, lastSeenISO] = tokens.reduce((memo, cur, idx) => {