From bc2117c0c14844af6de5c38bbc8aa077a4eaf9a8 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Mon, 20 Jan 2020 10:30:39 +0000
Subject: [PATCH] 0.14.0

---
 CHANGELOG.md           | 18 ++++++++++++++++++
 changelog.d/919.bugfix |  1 -
 changelog.d/920.bugfix |  1 -
 changelog.d/921.bugfix |  1 -
 changelog.d/925.bugfix |  1 -
 changelog.d/931.misc   |  1 -
 package-lock.json      |  2 +-
 package.json           |  2 +-
 scripts/towncrier.sh   |  0
 9 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/919.bugfix
 delete mode 100644 changelog.d/920.bugfix
 delete mode 100644 changelog.d/921.bugfix
 delete mode 100644 changelog.d/925.bugfix
 delete mode 100644 changelog.d/931.misc
 mode change 100644 => 100755 scripts/towncrier.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66a2aae50..6b2b82042 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+ 0.14.0 (2020-01-20)
+====================
+
+Bugfixes
+--------
+
+- If a new DM room is created for a IRC user, discard the old room. ([\#919](https://github.com/matrix-org/matrix-appservice-irc/issues/919))
+- Fix missig config.schema.yml in the Docker image ([\#920](https://github.com/matrix-org/matrix-appservice-irc/issues/920))
+- Stop trying to use sentry when config.sentry.enabled is false ([\#921](https://github.com/matrix-org/matrix-appservice-irc/issues/921))
+- Improve reply matching logic for Matrix messages. ([\#925](https://github.com/matrix-org/matrix-appservice-irc/issues/925))
+
+
+Internal Changes
+----------------
+
+- Use Typescript 3.7 and fix build issues. ([\#931](https://github.com/matrix-org/matrix-appservice-irc/issues/931))
+
+
 0.14.0-rc4 (2019-12-18)
 ========================
 
diff --git a/changelog.d/919.bugfix b/changelog.d/919.bugfix
deleted file mode 100644
index 850f79912..000000000
--- a/changelog.d/919.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-If a new DM room is created for a IRC user, discard the old room.
diff --git a/changelog.d/920.bugfix b/changelog.d/920.bugfix
deleted file mode 100644
index 00bfd900c..000000000
--- a/changelog.d/920.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix missig config.schema.yml in the Docker image
\ No newline at end of file
diff --git a/changelog.d/921.bugfix b/changelog.d/921.bugfix
deleted file mode 100644
index cfe508130..000000000
--- a/changelog.d/921.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Stop trying to use sentry when config.sentry.enabled is false
\ No newline at end of file
diff --git a/changelog.d/925.bugfix b/changelog.d/925.bugfix
deleted file mode 100644
index 2ffe8c81e..000000000
--- a/changelog.d/925.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve reply matching logic for Matrix messages.
diff --git a/changelog.d/931.misc b/changelog.d/931.misc
deleted file mode 100644
index 974cb90f3..000000000
--- a/changelog.d/931.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use Typescript 3.7 and fix build issues.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 565670c55..5c06c230d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.14.0-rc4",
+  "version": "0.14.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 05f929853..3d3afe3a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.14.0-rc4",
+  "version": "0.14.0",
   "description": "An IRC Bridge for Matrix",
   "main": "app.js",
   "bin": "./bin/matrix-appservice-irc",
diff --git a/scripts/towncrier.sh b/scripts/towncrier.sh
old mode 100644
new mode 100755