From 0dc7e55f7de6f94a793526eb9a79546e994a0f4f Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Tue, 1 Sep 2020 12:50:38 +0100
Subject: [PATCH] 1.5.0

---
 CHANGELOG.md            | 15 +++++++++++++++
 changelog.d/474.bugfix  |  1 -
 changelog.d/475.feature |  1 -
 package.json            |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/474.bugfix
 delete mode 100644 changelog.d/475.feature

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04d3f48b..18f0fd7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+ 1.5.0 (2020-09-01)
+===================
+
+Features
+--------
+
+- When a user connects their team for the first time, sync members and channels! ([\#475](https://github.com/matrix-org/matrix-appservice-slack/issues/475))
+
+
+Bugfixes
+--------
+
+- Fix schema for puppeting.direct_messages ([\#474](https://github.com/matrix-org/matrix-appservice-slack/issues/474))
+
+
 1.5.0-rc1 (2020-08-25)
 ===================
 
diff --git a/changelog.d/474.bugfix b/changelog.d/474.bugfix
deleted file mode 100644
index 21300797..00000000
--- a/changelog.d/474.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix schema for puppeting.direct_messages
diff --git a/changelog.d/475.feature b/changelog.d/475.feature
deleted file mode 100644
index d3a08e8d..00000000
--- a/changelog.d/475.feature
+++ /dev/null
@@ -1 +0,0 @@
-When a user connects their team for the first time, sync members and channels!
\ No newline at end of file
diff --git a/package.json b/package.json
index 9af0d636..e2665850 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.5.0-rc1",
+  "version": "1.5.0",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {