From f8f5dbb2dfdd4da2678b29968d13afcbb0274273 Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Mon, 20 Sep 2021 10:01:29 +0100
Subject: [PATCH] 0.31.0

---
 CHANGELOG.md            | 13 ++++++++++++-
 changelog.d/1471.bugfix |  1 -
 changelog.d/1478.bugfix |  1 -
 changelog.d/1479.bugfix |  1 -
 package-lock.json       |  5 ++---
 package.json            |  2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/1471.bugfix
 delete mode 100644 changelog.d/1478.bugfix
 delete mode 100644 changelog.d/1479.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84bd578e4..a2b6879c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,15 @@
- 0.31.0-rc1 (2021-08-23)
+0.31.0 (2021-09-20)
+========================
+
+Bugfixes
+--------
+
+- Fixed an issue where bridges using the NEdB datastore would still erroneously require IRC usernames to be unique. ([\#1471](https://github.com/matrix-org/matrix-appservice-irc/issues/1471))
+- Fixed a bug where `!help` in an admin room would not show admin commands. ([\#1478](https://github.com/matrix-org/matrix-appservice-irc/issues/1478))
+- Fix an edgecase where an nickname was not always set right for matrix users in PMs ([\#1479](https://github.com/matrix-org/matrix-appservice-irc/issues/1479))
+
+
+0.31.0-rc1 (2021-08-23)
 ========================
 
 Features
diff --git a/changelog.d/1471.bugfix b/changelog.d/1471.bugfix
deleted file mode 100644
index 58ce74b1a..000000000
--- a/changelog.d/1471.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an issue where bridges using the NEdB datastore would still erroneously require IRC usernames to be unique.
\ No newline at end of file
diff --git a/changelog.d/1478.bugfix b/changelog.d/1478.bugfix
deleted file mode 100644
index 9b86c1507..000000000
--- a/changelog.d/1478.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug where `!help` in an admin room would not show admin commands.
\ No newline at end of file
diff --git a/changelog.d/1479.bugfix b/changelog.d/1479.bugfix
deleted file mode 100644
index 71162d8e1..000000000
--- a/changelog.d/1479.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an edgecase where an nickname was not always set right for matrix users in PMs
diff --git a/package-lock.json b/package-lock.json
index a9f34e5f3..2e670a464 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,11 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.31.0-rc1",
+  "version": "0.31.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "matrix-appservice-irc",
-      "version": "0.31.0-rc1",
+      "version": "0.31.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@sentry/node": "^5.27.1",
diff --git a/package.json b/package.json
index 09cdf10be..ff7508faf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.31.0-rc1",
+  "version": "0.31.0",
   "description": "An IRC Bridge for Matrix",
   "main": "app.js",
   "bin": "./bin/matrix-appservice-irc",