From 8a747a1b625840683f7ce86e8edace42c6971f8d Mon Sep 17 00:00:00 2001
From: Devon Hudson <devonhudson@librem.one>
Date: Thu, 21 Mar 2024 07:25:06 -0600
Subject: [PATCH] 0.14.0

---
 CHANGELOG.md            | 12 ++++++++++++
 changelog.d/344.feature |  1 -
 changelog.d/360.bugfix  |  1 -
 changelog.d/361.feature |  1 -
 changelog.d/364.bugfix  |  1 -
 5 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/344.feature
 delete mode 100644 changelog.d/360.bugfix
 delete mode 100644 changelog.d/361.feature
 delete mode 100644 changelog.d/364.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 932927c8..be26b0ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# Sygnal 0.14.0 (2024-03-21)
+
+### Features
+
+- Add a new `convert_device_token_to_hex` configuration option for APNs apps, to allow disabling the conversion of device tokens from base64 to hex. ([\#344](https://github.com/matrix-org/sygnal/issues/344))
+- Adds the ability to use the new FCM v1 API. ([\#361](https://github.com/matrix-org/sygnal/issues/361))
+
+### Bugfixes
+
+- Fixed an issue which resulted in proxy configuration being ignored for APNs notifications. ([\#360](https://github.com/matrix-org/sygnal/issues/360))
+
+
 # Sygnal 0.13.0 (2023-11-21)
 
 Sygnal will soon be forked by Element under an AGPLv3.0 licence (with CLA, for
diff --git a/changelog.d/344.feature b/changelog.d/344.feature
deleted file mode 100644
index bbc908d1..00000000
--- a/changelog.d/344.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a new `convert_device_token_to_hex` configuration option for APNs apps, to allow disabling the conversion of device tokens from base64 to hex.
\ No newline at end of file
diff --git a/changelog.d/360.bugfix b/changelog.d/360.bugfix
deleted file mode 100644
index 5529e96e..00000000
--- a/changelog.d/360.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an issue which resulted in proxy configuration being ignored for APNs notifications.
diff --git a/changelog.d/361.feature b/changelog.d/361.feature
deleted file mode 100644
index a5751518..00000000
--- a/changelog.d/361.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds the ability to use the new FCM v1 API.
diff --git a/changelog.d/364.bugfix b/changelog.d/364.bugfix
deleted file mode 100644
index b7bd4f64..00000000
--- a/changelog.d/364.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add convert_device_token_to_hex to the list of understood APNs config parameters.