From a7a4554a85485e32369377966e7cd02fa3656ddf Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 28 Jan 2018 19:36:02 +0100
Subject: [PATCH] Release v1.7.0

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

diff --git a/README.md b/README.md
index 1b0fb30f..176aa7dd 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ See https://github.com/42wim/matterbridge/wiki
 
 # Installing
 ## Binaries
-* Latest stable release [v1.6.3](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.7.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 e82746b8..fb5db4c9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,19 @@
+# v1.7.0
+## New features
+* matrix: Add support for deleting messages from/to matrix (matrix). Closes #320
+* xmpp: Ignore <subject> messages (xmpp). #272
+* irc: Add twitch support (irc) to README / wiki
+
+## Bugfix
+* general: Change RemoteNickFormat replacement order. Closes #336
+* general: Make edits/delete work for bridges that gets reused. Closes #342
+* general: Lowercase irc channels in config. Closes #348
+* matrix: Fix possible panics (matrix). Closes #333
+* matrix: Add an extension to images without one (matrix). #331
+* api: Obey the Gateway value from the json (api). Closes #344
+* xmpp: Print only debug messages when specified (xmpp). Closes #345
+* xmpp: Allow xmpp to receive the extra messages (file uploads) when text is empty. #295
+
 # v1.6.3
 ## Bugfix
 * slack: Fix connection issues
diff --git a/matterbridge.go b/matterbridge.go
index e755ea72..4cf59356 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	version = "1.7.0-dev"
+	version = "1.7.0"
 	githash string
 )