From f8ab3abc3827e02f004b55602e70a9b94ba2091b Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Fri, 6 Nov 2020 12:44:57 +0000
Subject: [PATCH] v2.3.1

---
 CHANGELOG.md           | 25 +++++++++++++++++++++++++
 changelog.d/264.bugfix |  1 -
 changelog.d/267.bugfix |  1 -
 changelog.d/268.doc    |  1 -
 changelog.d/269.doc    |  1 -
 changelog.d/270.bugfix |  1 -
 changelog.d/272.doc    |  1 -
 changelog.d/273.misc   |  1 -
 package-lock.json      |  2 +-
 package.json           |  2 +-
 10 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 changelog.d/264.bugfix
 delete mode 100644 changelog.d/267.bugfix
 delete mode 100644 changelog.d/268.doc
 delete mode 100644 changelog.d/269.doc
 delete mode 100644 changelog.d/270.bugfix
 delete mode 100644 changelog.d/272.doc
 delete mode 100644 changelog.d/273.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b55a389d..d80a5420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+2.3.1 (2020-11-06)
+=======================
+
+Bugfixes
+--------
+
+- Remove `winston-daily-rotate-file` side-effects which can throw errors with some installed `winston` versions ([\#264](https://github.com/matrix-org/matrix-appservice-bridge/issues/264))
+- Fixed a bug where encrypted events may be handled twice. ([\#267](https://github.com/matrix-org/matrix-appservice-bridge/issues/267))
+- Update `matrix-appservice` dependency to 0.7.1 to fix a bug where `msc2409.push_ephemeral` would be required in the registration file. ([\#270](https://github.com/matrix-org/matrix-appservice-bridge/issues/270))
+
+
+Improved Documentation
+----------------------
+
+- Render various opts objects in the documentation that were missed last time ([\#268](https://github.com/matrix-org/matrix-appservice-bridge/issues/268))
+- Add contributing docs to make first time contributions easier ([\#269](https://github.com/matrix-org/matrix-appservice-bridge/issues/269))
+- Replace usages of deprecated `event.user_id` field with `event.sender` in examples. ([\#272](https://github.com/matrix-org/matrix-appservice-bridge/issues/272))
+
+
+Internal Changes
+----------------
+
+- Remove travis-ci build status badge on README.md. ([\#273](https://github.com/matrix-org/matrix-appservice-bridge/issues/273))
+
+
 2.3.0 (2020-10-26)
 ===================
 
diff --git a/changelog.d/264.bugfix b/changelog.d/264.bugfix
deleted file mode 100644
index 84c61d3d..00000000
--- a/changelog.d/264.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Remove `winston-daily-rotate-file` side-effects which can throw errors with some installed `winston` versions
diff --git a/changelog.d/267.bugfix b/changelog.d/267.bugfix
deleted file mode 100644
index ae568316..00000000
--- a/changelog.d/267.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug where encrypted events may be handled twice.
diff --git a/changelog.d/268.doc b/changelog.d/268.doc
deleted file mode 100644
index 4ff27cba..00000000
--- a/changelog.d/268.doc
+++ /dev/null
@@ -1 +0,0 @@
-Render various opts objects in the documentation that were missed last time
diff --git a/changelog.d/269.doc b/changelog.d/269.doc
deleted file mode 100644
index 96fe67a8..00000000
--- a/changelog.d/269.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add contributing docs to make first time contributions easier
diff --git a/changelog.d/270.bugfix b/changelog.d/270.bugfix
deleted file mode 100644
index f8277e7e..00000000
--- a/changelog.d/270.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Update `matrix-appservice` dependency to 0.7.1 to fix a bug where `msc2409.push_ephemeral` would be required in the registration file.
\ No newline at end of file
diff --git a/changelog.d/272.doc b/changelog.d/272.doc
deleted file mode 100644
index c9046a8d..00000000
--- a/changelog.d/272.doc
+++ /dev/null
@@ -1 +0,0 @@
-Replace usages of deprecated `event.user_id` field with `event.sender` in examples.
\ No newline at end of file
diff --git a/changelog.d/273.misc b/changelog.d/273.misc
deleted file mode 100644
index eafffda3..00000000
--- a/changelog.d/273.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove travis-ci build status badge on README.md.
diff --git a/package-lock.json b/package-lock.json
index 1285d2ad..b16bfed9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b55a7165..aa70b4f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Bridging infrastructure for Matrix Application Services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",