From 7961ce0fa5d4534af2f963abecbc1cc65ed38a51 Mon Sep 17 00:00:00 2001
From: Christian Paul <christianp@matrix.org>
Date: Fri, 12 Aug 2022 01:38:28 +0200
Subject: [PATCH] v3.0.0

---
 CHANGELOG.md            | 26 ++++++++++++++++++++++++++
 changelog.d/657.misc    |  1 -
 changelog.d/823.bugfix  |  1 -
 changelog.d/825.removal |  1 -
 changelog.d/826.misc    |  1 -
 changelog.d/828.bugfix  |  1 -
 changelog.d/829.bugfix  |  2 --
 changelog.d/830.misc    |  1 -
 package.json            |  2 +-
 9 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 changelog.d/657.misc
 delete mode 100644 changelog.d/823.bugfix
 delete mode 100644 changelog.d/825.removal
 delete mode 100644 changelog.d/826.misc
 delete mode 100644 changelog.d/828.bugfix
 delete mode 100644 changelog.d/829.bugfix
 delete mode 100644 changelog.d/830.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36c631e..9922eb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+3.0.0 (2022-08-12)
+==================
+
+Bugfixes
+--------
+
+- Make sure we don't lose errors thrown when checking usage limits. ([\#823](https://github.com/matrix-org/matrix-appservice-discord/issues/823))
+- Fix Docker instances not starting due to being unable to load a dynamic library in the latest unstable image. ([\#828](https://github.com/matrix-org/matrix-appservice-discord/issues/828))
+- Remove matrix.to hyperlinks when relaying non-Discord user mentions to Discord.
+  Fix mentioning Matrix users in Discord. ([\#829](https://github.com/matrix-org/matrix-appservice-discord/issues/829))
+
+
+Deprecations and Removals
+-------------------------
+
+- Minimum required Node.js version is now 16. ([\#825](https://github.com/matrix-org/matrix-appservice-discord/issues/825))
+
+
+Internal Changes
+----------------
+
+- Remove unused variables. ([\#657](https://github.com/matrix-org/matrix-appservice-discord/issues/657))
+- Add workflow for building docker images, and push new docker images to ghcr.io. ([\#826](https://github.com/matrix-org/matrix-appservice-discord/issues/826))
+- Remove `git config` workaround to pull a dependency from github.com. ([\#830](https://github.com/matrix-org/matrix-appservice-discord/issues/830))
+
+
 2.0.0 (2022-08-05)
 ==================
 
diff --git a/changelog.d/657.misc b/changelog.d/657.misc
deleted file mode 100644
index 76dac59..0000000
--- a/changelog.d/657.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused variables.
\ No newline at end of file
diff --git a/changelog.d/823.bugfix b/changelog.d/823.bugfix
deleted file mode 100644
index 4e4b072..0000000
--- a/changelog.d/823.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make sure we don't lose errors thrown when checking usage limits.
diff --git a/changelog.d/825.removal b/changelog.d/825.removal
deleted file mode 100644
index 9dc58da..0000000
--- a/changelog.d/825.removal
+++ /dev/null
@@ -1 +0,0 @@
-Minimum required Node.js version is now 16.
\ No newline at end of file
diff --git a/changelog.d/826.misc b/changelog.d/826.misc
deleted file mode 100644
index 0892c5b..0000000
--- a/changelog.d/826.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add workflow for building docker images, and push new docker images to ghcr.io.
diff --git a/changelog.d/828.bugfix b/changelog.d/828.bugfix
deleted file mode 100644
index b58c10e..0000000
--- a/changelog.d/828.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Docker instances not starting due to being unable to load a dynamic library in the latest unstable image.
diff --git a/changelog.d/829.bugfix b/changelog.d/829.bugfix
deleted file mode 100644
index 7fd6155..0000000
--- a/changelog.d/829.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove matrix.to hyperlinks when relaying non-Discord user mentions to Discord.
-Fix mentioning Matrix users in Discord.
diff --git a/changelog.d/830.misc b/changelog.d/830.misc
deleted file mode 100644
index 1e266b8..0000000
--- a/changelog.d/830.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove `git config` workaround to pull a dependency from github.com.
\ No newline at end of file
diff --git a/package.json b/package.json
index 9dc8783..b26e995 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-discord",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "A bridge between Matrix and Discord",
   "main": "discordas.js",
   "engines": {
-- 
GitLab