From 85d3f5b32f908c0b017a136c130bf2b8151befe5 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Tue, 2 May 2023 14:13:20 +0100
Subject: [PATCH] Changelog for v1.10.0

---
 CHANGES.md             | 17 +++++++++++++++++
 changelog.d/71.misc    |  1 -
 changelog.d/72.feature |  1 -
 changelog.d/74.misc    |  1 -
 changelog.d/75.feature |  1 -
 5 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/71.misc
 delete mode 100644 changelog.d/72.feature
 delete mode 100644 changelog.d/74.misc
 delete mode 100644 changelog.d/75.feature

diff --git a/CHANGES.md b/CHANGES.md
index abcee7d..5e6cacc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+1.10.0 (2023-05-02)
+===================
+
+Features
+--------
+
+- Add --repeat-delay-hours option to cleanup script to run persistently outside of a cronjob. ([\#72](https://github.com/matrix-org/rageshake/issues/72))
+- Allow gzipped json & txt files to be uploaded as attachments to rageshakes. ([\#75](https://github.com/matrix-org/rageshake/issues/75))
+
+
+Internal Changes
+----------------
+
+- Creates a new `rageshake/scripts` image with cleanup script, ensure `latest` tag is correctly applied. ([\#71](https://github.com/matrix-org/rageshake/issues/71))
+- Update README.md to include json as a valid extension for file uploads. ([\#74](https://github.com/matrix-org/rageshake/issues/74))
+
+
 1.9.0 (2023-03-22)
 ==================
 
diff --git a/changelog.d/71.misc b/changelog.d/71.misc
deleted file mode 100644
index e084f92..0000000
--- a/changelog.d/71.misc
+++ /dev/null
@@ -1 +0,0 @@
-Creates a new `rageshake/scripts` image with cleanup script, ensure `latest` tag is correctly applied.
diff --git a/changelog.d/72.feature b/changelog.d/72.feature
deleted file mode 100644
index 6af76ac..0000000
--- a/changelog.d/72.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add --repeat-delay-hours option to cleanup script to run persistently outside of a cronjob.
diff --git a/changelog.d/74.misc b/changelog.d/74.misc
deleted file mode 100644
index e57bda0..0000000
--- a/changelog.d/74.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update README.md to include json as a valid extension for file uploads.
diff --git a/changelog.d/75.feature b/changelog.d/75.feature
deleted file mode 100644
index b13ca06..0000000
--- a/changelog.d/75.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow gzipped json & txt files to be uploaded as attachments to rageshakes.