From fac5f69ad2a5aedb48155892fa974c6b06abb33e Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 23 Dec 2017 00:28:01 +0100
Subject: [PATCH] Release v1.6.0

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

diff --git a/README.md b/README.md
index cd9ba93a..a1255711 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ See https://github.com/42wim/matterbridge/wiki
 
 # Installing
 ## Binaries
-* Latest stable release [v1.5.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.6.0](https://github.com/42wim/matterbridge/releases/latest)
 * Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)  
 
 ## Building
diff --git a/changelog.md b/changelog.md
index a4f2cad9..63fc3c74 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,15 @@
-# v1.6.0-dev
+# v1.6.0
 ## New features
 * sshchat: New protocol support added (https://github.com/shazow/ssh-chat)
+* general: Allow specifying maximum download size of media using MediaDownloadSize (slack,telegram,matrix)
+* api: Add (simple, one listener) long-polling support (api). Closes #307
+* telegram: Add support for forwarded messages. Closes #313
+* telegram: Add support for Audio/Voice files (telegram). Closes #314
+* irc: Add RejoinDelay option. Delay to rejoin after channel kick (irc). Closes #322
+
+## Bugfix
+* telegram: Also use HTML in edited messages (telegram). Closes #315
+* matrix: Fix panic (matrix). Closes #316
 
 # v1.5.1
 
diff --git a/matterbridge.go b/matterbridge.go
index 72fea340..87bd4e55 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	version = "1.6.0-dev"
+	version = "1.6.0"
 	githash string
 )