From 87788f354f796c8ed93d2ef9318002b056a74577 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Mon, 15 Jul 2019 23:09:46 +0200
Subject: [PATCH] Release v1.15.1

---
 README.md       | 2 +-
 changelog.md    | 4 ++++
 matterbridge.go | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4bc4b4fb..50c50cad 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ See https://github.com/42wim/matterbridge/wiki
 
 ## Installing / upgrading
 ### Binaries
-* Latest stable release [v1.15.0](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.15.1](https://github.com/42wim/matterbridge/releases/latest)
 * Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
 
 To install or upgrade just download the latest [binary](https://github.com/42wim/matterbridge/releases/latest) and follow the instructions on the [howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config) for a step by step walkthrough for creating your configuration.
diff --git a/changelog.md b/changelog.md
index 51a3cb43..e54a8095 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,14 @@
 # dev
+
+# v1.15.1
 ## Enhancements
 * discord: Support bulk deletions #851
+* discord: Support channels in categories #863 (use category/channel. See matterbridge.toml.sample for more info)
 * mattermost: Add an option to skip the Mattermost server version check #849
 
 ## Bugfix
 * xmpp: fix segfault when disconnected/reconnected #856
+* telegram: fix panic in handleEntities #858
 
 # v1.15.0
 ## New features
diff --git a/matterbridge.go b/matterbridge.go
index 401e7e4c..2c265091 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	version = "1.15.1-dev"
+	version = "1.15.1"
 	githash string
 
 	flagConfig  = flag.String("conf", "matterbridge.toml", "config file")