From 1e44e52179216d3158ade0facb31107340bfb72c Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Sat, 3 Sep 2022 03:08:13 +0100
Subject: [PATCH] 2.1.2

---
 CHANGELOG.md           | 9 +++++++++
 changelog.d/469.bugfix | 1 -
 package.json           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/469.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0fbe0bb..7192750a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+2.1.2 (2022-09-03)
+==================
+
+Bugfixes
+--------
+
+- Fix a bug where reading RSS feeds could crash the process. ([\#469](https://github.com/matrix-org/matrix-hookshot/issues/469))
+
+
 2.1.1 (2022-09-02)
 ==================
 
diff --git a/changelog.d/469.bugfix b/changelog.d/469.bugfix
deleted file mode 100644
index cec52ac3..00000000
--- a/changelog.d/469.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where reading RSS feeds could crash the process.
\ No newline at end of file
diff --git a/package.json b/package.json
index 270438bf..0ddeb41e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",