From 6c62a3a82c6f11cc72d51f75f50d2d5ffe03cf7f Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Thu, 13 Feb 2020 17:22:35 +0000
Subject: [PATCH] 0.15.2

---
 CHANGELOG.md            | 18 +++++++++++++++++-
 changelog.d/977.bugfix  |  1 -
 changelog.d/978.feature |  1 -
 changelog.d/979.bugfix  |  1 -
 package-lock.json       |  2 +-
 package.json            |  2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/977.bugfix
 delete mode 100644 changelog.d/978.feature
 delete mode 100644 changelog.d/979.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 415dda2d9..437cc5af8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
- 0.15.1 (2020-02-06)
+ 0.15.2 (2020-02-13)
+====================
+
+Features
+--------
+
+- The bridge will now notify you if a DM recipient is offline. ([\#978](https://github.com/matrix-org/matrix-appservice-irc/issues/978))
+
+
+Bugfixes
+--------
+
+- Fix "User did not rejoin" error when bridge debounces QUITs ([\#977](https://github.com/matrix-org/matrix-appservice-irc/issues/977))
+- Fix an issue where users were not rejoined to channels on netsplit/password change. ([\#979](https://github.com/matrix-org/matrix-appservice-irc/issues/979))
+
+
+0.15.1 (2020-02-06)
 ====================
 
 Bugfixes
diff --git a/changelog.d/977.bugfix b/changelog.d/977.bugfix
deleted file mode 100644
index beb565b95..000000000
--- a/changelog.d/977.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix "User did not rejoin" error when bridge debounces QUITs
\ No newline at end of file
diff --git a/changelog.d/978.feature b/changelog.d/978.feature
deleted file mode 100644
index 2b1e7e173..000000000
--- a/changelog.d/978.feature
+++ /dev/null
@@ -1 +0,0 @@
-The bridge will now notify you if a DM recipient is offline.
\ No newline at end of file
diff --git a/changelog.d/979.bugfix b/changelog.d/979.bugfix
deleted file mode 100644
index 079beeecc..000000000
--- a/changelog.d/979.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue where users were not rejoined to channels on netsplit/password change.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 018ca6c44..035ca0d6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eb0642db1..8e7af01f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "An IRC Bridge for Matrix",
   "main": "app.js",
   "bin": "./bin/matrix-appservice-irc",