From 4bfb1a5a209378c3d02c35a1742f4eb68bd415b2 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 24 Sep 2019 15:37:46 +0100
Subject: [PATCH] 1.0.0-rc4

---
 CHANGELOG.md           | 23 ++++++++++++++++++++++-
 changelog.d/239.misc   |  1 -
 changelog.d/251.misc   |  1 -
 changelog.d/253.bugfix |  1 -
 changelog.d/254.bugfix |  1 -
 changelog.d/255.bugfix |  1 -
 changelog.d/256.bugfix |  1 -
 changelog.d/257.bugfix |  1 -
 changelog.d/258.misc   |  1 -
 package.json           |  2 +-
 10 files changed, 23 insertions(+), 10 deletions(-)
 delete mode 100644 changelog.d/239.misc
 delete mode 100644 changelog.d/251.misc
 delete mode 100644 changelog.d/253.bugfix
 delete mode 100644 changelog.d/254.bugfix
 delete mode 100644 changelog.d/255.bugfix
 delete mode 100644 changelog.d/256.bugfix
 delete mode 100644 changelog.d/257.bugfix
 delete mode 100644 changelog.d/258.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd70293..6eabb808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,25 @@
- 1.0.0-rc3 (2019-09-24)
+ 1.0.0-rc4 (2019-09-24)
+=======================
+
+Bugfixes
+--------
+
+- Fix multi-person DMs being marked with the group (private channel) type rather than the mpim type. ([\#253](https://github.com/matrix-org/matrix-appservice-slack/issues/253))
+- Connecting an account via OAuth will no longer barf on the lack of a `puppeting` parameter ([\#254](https://github.com/matrix-org/matrix-appservice-slack/issues/254))
+- Don't log stack traces for missing rooms, teams or events ([\#255](https://github.com/matrix-org/matrix-appservice-slack/issues/255))
+- Don't log the whole response object when an error occurs when sending slack requests ([\#256](https://github.com/matrix-org/matrix-appservice-slack/issues/256))
+- Fix .toUpperCase() errors due to the bridge trying to handle unknown deleted messages ([\#257](https://github.com/matrix-org/matrix-appservice-slack/issues/257))
+
+
+Internal Changes
+----------------
+
+- Update datastore.md with a few more options ([\#239](https://github.com/matrix-org/matrix-appservice-slack/issues/239))
+- Fix issue where towncrier would wrongly link to matrix-appservice-slack-issues ([\#251](https://github.com/matrix-org/matrix-appservice-slack/issues/251))
+- Towncrier should check against develop for changelog changes ([\#258](https://github.com/matrix-org/matrix-appservice-slack/issues/258))
+
+
+1.0.0-rc3 (2019-09-24)
 =======================
 
 Bugfixes
diff --git a/changelog.d/239.misc b/changelog.d/239.misc
deleted file mode 100644
index fc84b6be..00000000
--- a/changelog.d/239.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update datastore.md with a few more options
diff --git a/changelog.d/251.misc b/changelog.d/251.misc
deleted file mode 100644
index a24162cc..00000000
--- a/changelog.d/251.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where towncrier would wrongly link to matrix-appservice-slack-issues
diff --git a/changelog.d/253.bugfix b/changelog.d/253.bugfix
deleted file mode 100644
index 18272fda..00000000
--- a/changelog.d/253.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix multi-person DMs being marked with the group (private channel) type rather than the mpim type.
diff --git a/changelog.d/254.bugfix b/changelog.d/254.bugfix
deleted file mode 100644
index c2f42c87..00000000
--- a/changelog.d/254.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Connecting an account via OAuth will no longer barf on the lack of a `puppeting` parameter
\ No newline at end of file
diff --git a/changelog.d/255.bugfix b/changelog.d/255.bugfix
deleted file mode 100644
index 738fb2c3..00000000
--- a/changelog.d/255.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't log stack traces for missing rooms, teams or events
\ No newline at end of file
diff --git a/changelog.d/256.bugfix b/changelog.d/256.bugfix
deleted file mode 100644
index 63a8b93c..00000000
--- a/changelog.d/256.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't log the whole response object when an error occurs when sending slack requests
\ No newline at end of file
diff --git a/changelog.d/257.bugfix b/changelog.d/257.bugfix
deleted file mode 100644
index 9218cb6e..00000000
--- a/changelog.d/257.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix .toUpperCase() errors due to the bridge trying to handle unknown deleted messages
diff --git a/changelog.d/258.misc b/changelog.d/258.misc
deleted file mode 100644
index 6cb94a35..00000000
--- a/changelog.d/258.misc
+++ /dev/null
@@ -1 +0,0 @@
-Towncrier should check against develop for changelog changes
\ No newline at end of file
diff --git a/package.json b/package.json
index fe867330..b94dd0ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.0.0-rc3",
+  "version": "1.0.0-rc4",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {