From ba6c661a6f2ea4fb0f32305ddfef7ae281f81f8d Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Wed, 13 Nov 2019 12:11:31 +0000
Subject: [PATCH] 1.0.2

---
 CHANGELOG.md            | 24 ++++++++++++++++++++++++
 changelog.d/266.feature |  1 -
 changelog.d/299.bugfix  |  1 -
 changelog.d/302.bugfix  |  1 -
 changelog.d/306.doc     |  1 -
 changelog.d/317.doc     |  1 -
 changelog.d/320.bugfix  |  1 -
 package-lock.json       |  2 +-
 package.json            |  2 +-
 9 files changed, 26 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/266.feature
 delete mode 100644 changelog.d/299.bugfix
 delete mode 100644 changelog.d/302.bugfix
 delete mode 100644 changelog.d/306.doc
 delete mode 100644 changelog.d/317.doc
 delete mode 100644 changelog.d/320.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b158ab9..d98a312a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+ 1.0.2 (2019-11-13)
+===================
+
+Features
+--------
+
+- Messages bridged to Slack now get links with text-based content unfurled ([\#266](https://github.com/matrix-org/matrix-appservice-slack/issues/266))
+
+
+Bugfixes
+--------
+
+- Fix Markdown link replacements deleting link text, links, and text between links. ([\#299](https://github.com/matrix-org/matrix-appservice-slack/issues/299))
+- Fix Matrix images being sent as the filename only on Slack ([\#302](https://github.com/matrix-org/matrix-appservice-slack/issues/302))
+- Mentions will now work if followed by a colon and a space ([\#320](https://github.com/matrix-org/matrix-appservice-slack/issues/320))
+
+
+Improved Documentation
+----------------------
+
+- Fix minor typos in documentation that made it inconsistent ([\#306](https://github.com/matrix-org/matrix-appservice-slack/issues/306))
+- Fix syntax typo for service start command. ([\#317](https://github.com/matrix-org/matrix-appservice-slack/issues/317))
+
+
 1.0.1 (2019-10-08)
 ===================
 
diff --git a/changelog.d/266.feature b/changelog.d/266.feature
deleted file mode 100644
index 2801c7dc..00000000
--- a/changelog.d/266.feature
+++ /dev/null
@@ -1 +0,0 @@
-Messages bridged to Slack now get links with text-based content unfurled
diff --git a/changelog.d/299.bugfix b/changelog.d/299.bugfix
deleted file mode 100644
index a7d80078..00000000
--- a/changelog.d/299.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Markdown link replacements deleting link text, links, and text between links.
diff --git a/changelog.d/302.bugfix b/changelog.d/302.bugfix
deleted file mode 100644
index 94feb8fa..00000000
--- a/changelog.d/302.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Matrix images being sent as the filename only on Slack
diff --git a/changelog.d/306.doc b/changelog.d/306.doc
deleted file mode 100644
index 1d37af5a..00000000
--- a/changelog.d/306.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix minor typos in documentation that made it inconsistent
diff --git a/changelog.d/317.doc b/changelog.d/317.doc
deleted file mode 100644
index 9f671749..00000000
--- a/changelog.d/317.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix syntax typo for service start command.
\ No newline at end of file
diff --git a/changelog.d/320.bugfix b/changelog.d/320.bugfix
deleted file mode 100644
index 9c6b9706..00000000
--- a/changelog.d/320.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Mentions will now work if followed by a colon and a space
diff --git a/package-lock.json b/package-lock.json
index 15461345..14d111d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 84e673d4..f6497122 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {