From d582bc36841b5790303bc8f60aec10bb61085b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20So=C5=9Bnierz?= <tadeusz@sosnierz.com>
Date: Thu, 3 Nov 2022 10:38:33 +0100
Subject: [PATCH] v3.1.0
---
CHANGELOG.md | 17 +++++++++++++++++
changelog.d/834.bugfix | 1 -
changelog.d/836.feature | 1 -
changelog.d/842.bugfix | 1 -
changelog.d/858.bugfix | 1 -
package.json | 2 +-
6 files changed, 18 insertions(+), 5 deletions(-)
delete mode 100644 changelog.d/834.bugfix
delete mode 100644 changelog.d/836.feature
delete mode 100644 changelog.d/842.bugfix
delete mode 100644 changelog.d/858.bugfix
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9922eb3..a1cba64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+3.1.0 (2022-11-03)
+==================
+
+Features
+--------
+
+- Adds a config value, in order to disable forwarding room topic changes from Matrix to Discord (`disableRoomTopicNotifications`, false by default). ([\#836](https://github.com/matrix-org/matrix-appservice-discord/issues/836))
+
+
+Bugfixes
+--------
+
+- Include the domain name in the regular expression. ([\#834](https://github.com/matrix-org/matrix-appservice-discord/issues/834))
+- Remove usage of unreliable field `age` on events, allowing the bridge to work with non-Synapse homeserver implementations. ([\#842](https://github.com/matrix-org/matrix-appservice-discord/issues/842))
+- Prevent crashes when handling messages sent to voice channels. ([\#858](https://github.com/matrix-org/matrix-appservice-discord/issues/858))
+
+
3.0.0 (2022-08-12)
==================
diff --git a/changelog.d/834.bugfix b/changelog.d/834.bugfix
deleted file mode 100644
index a176a18..0000000
--- a/changelog.d/834.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Include the domain name in the regular expression.
diff --git a/changelog.d/836.feature b/changelog.d/836.feature
deleted file mode 100644
index fa8cf9c..0000000
--- a/changelog.d/836.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds a config value, in order to disable forwarding room topic changes from Matrix to Discord (`disableRoomTopicNotifications`, false by default).
diff --git a/changelog.d/842.bugfix b/changelog.d/842.bugfix
deleted file mode 100644
index 3101d65..0000000
--- a/changelog.d/842.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Remove usage of unreliable field `age` on events, allowing the bridge to work with non-Synapse homeserver implementations.
\ No newline at end of file
diff --git a/changelog.d/858.bugfix b/changelog.d/858.bugfix
deleted file mode 100644
index 60df223..0000000
--- a/changelog.d/858.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent crashes when handling messages sent to voice channels.
diff --git a/package.json b/package.json
index 305900b..f3a2026 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-appservice-discord",
- "version": "3.0.0",
+ "version": "3.1.0",
"description": "A bridge between Matrix and Discord",
"main": "discordas.js",
"engines": {
--
GitLab