Merge commit '28740de766f5178802400700b4db6f793371c642' into v3.x

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

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) => {