From 924930019ea968b8354442b909cc97848a96b5b8 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 4 Oct 2024 11:11:37 +0100
Subject: [PATCH] 0.15.1

---
 CHANGELOG.md           | 15 +++++++++++++++
 changelog.d/391.doc    |  1 -
 changelog.d/395.bugfix |  1 -
 changelog.d/396.misc   |  1 -
 pyproject.toml         |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/391.doc
 delete mode 100644 changelog.d/395.bugfix
 delete mode 100644 changelog.d/396.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b2ff57..ea88e602 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# Sygnal 1.15.1 (2024-10-04)
+
+### Bugfixes
+
+- Fix incompatibility with `aiohttp>=3.10.0` when using GCM with an HTTP proxy. ([\#395](https://github.com/matrix-org/sygnal/issues/395))
+
+### Improved Documentation
+
+- The Matrix.org Foundation no longer requires "real" or "legally identifiable" names in order to contribute to projects. ([\#391](https://github.com/matrix-org/sygnal/issues/391))
+
+### Internal Changes
+
+- Pin `aiohttp` dependency to <= 4.0.0. ([\#396](https://github.com/matrix-org/sygnal/issues/396))
+
+
 # Sygnal 0.15.0 (2024-06-26)
 
 **NOTE**: Exercise caution when installing over an existing sygnal installation via pip. The
diff --git a/changelog.d/391.doc b/changelog.d/391.doc
deleted file mode 100644
index 3ebae098..00000000
--- a/changelog.d/391.doc
+++ /dev/null
@@ -1 +0,0 @@
-The Matrix.org Foundation no longer requires "real" or "legally identifiable" names in order to contribute to projects.
\ No newline at end of file
diff --git a/changelog.d/395.bugfix b/changelog.d/395.bugfix
deleted file mode 100644
index 8c4e4494..00000000
--- a/changelog.d/395.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incompatibility with `aiohttp>=3.10.0` when using GCM with an HTTP proxy.
\ No newline at end of file
diff --git a/changelog.d/396.misc b/changelog.d/396.misc
deleted file mode 100644
index 0c1aa80d..00000000
--- a/changelog.d/396.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pin `aiohttp` dependency to <= 4.0.0.
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index c368b295..8ae8b6b1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "matrix-sygnal"
-version = "0.15.0"
+version = "0.15.1"
 description = "Reference Push Gateway for Matrix Notifications"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 readme = "README.md"