From 7ce573925b2626667a5b038ad2fbaea06f8ffc06 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 24 Jun 2020 10:55:26 -0400
Subject: [PATCH] 0.7.0

---
 CHANGELOG.md            | 21 +++++++++++++++++++++
 changelog.d/125.misc    |  1 -
 changelog.d/126.doc     |  1 -
 changelog.d/127.feature |  1 -
 4 files changed, 21 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/125.misc
 delete mode 100644 changelog.d/126.doc
 delete mode 100644 changelog.d/127.feature

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 302fba83..4e8723c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Sygnal 0.7.0 (2020-06-24)
+=========================
+
+Features
+--------
+
+- Use `default_payload` from the device data for both APNS and GCM payloads. ([\#127](https://github.com/matrix-org/sygnal/issues/127))
+
+
+Improved Documentation
+----------------------
+
+- Note information about Docker files in release instructions. ([\#126](https://github.com/matrix-org/sygnal/issues/126))
+
+
+Internal Changes
+----------------
+
+- Improve logging if a pushkin cannot be created. ([\#125](https://github.com/matrix-org/sygnal/issues/125))
+
+
 Sygnal 0.6.0 (2020-05-12)
 =========================
 
diff --git a/changelog.d/125.misc b/changelog.d/125.misc
deleted file mode 100644
index b053f6a3..00000000
--- a/changelog.d/125.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve logging if a pushkin cannot be created.
diff --git a/changelog.d/126.doc b/changelog.d/126.doc
deleted file mode 100644
index 256c142c..00000000
--- a/changelog.d/126.doc
+++ /dev/null
@@ -1 +0,0 @@
-Note information about docker files in release instructions.
\ No newline at end of file
diff --git a/changelog.d/127.feature b/changelog.d/127.feature
deleted file mode 100644
index 5603fffc..00000000
--- a/changelog.d/127.feature
+++ /dev/null
@@ -1 +0,0 @@
-Use default_payload from device data for both APNS and GCM payloads.