From e3d8fe4fd8419236fd3c5e6f505b30d93b36f9bc Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Fri, 24 Jul 2020 21:00:57 +0200
Subject: [PATCH] Release v1.18.0 (#1176)

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

diff --git a/README.md b/README.md
index 520af0b8..32f26fd6 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ See https://github.com/42wim/matterbridge/wiki
 
 ### Binaries
 
-- Latest stable release [v1.17.5](https://github.com/42wim/matterbridge/releases/latest)
+- Latest stable release [v1.18.0](https://github.com/42wim/matterbridge/releases/latest)
 - Development releases (follows master) can be downloaded [here](https://github.com/42wim/matterbridge/actions) selecting the latest green build and then artifacts.
 
 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 ae7ce09c..191dc0de 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,29 @@
+# v1.18.0
+
+## New features
+
+- nctalk: new protocol added. Add Nextcloud Talk support #1167
+- general: Add an option to log into a file rather than stdout (#1168)
+- api: Add websocket to API (#970)
+
+## Enhancements
+
+- telegram: Fix MarkdownV2 support in Telegram (#1169)
+- whatsapp: Reload user information when a new contact is detected (whatsapp) (#1160)
+- api: Add sane RemoteNickFormat default for API (#1157)
+- irc: Skip gIRC built-in rate limiting (irc) (#1164)
+- irc: Only colour IRC nicks if there is one. (#1161)
+- docker: Combine runs to one layer (#1151)
+
+## Bugfix
+
+- general: Update dependencies for 1.18.0 release (#1175)
+
+Discord users are encouraged to upgrade, this release works with the move to the discord.com domain.
+
+This release couldn't exist without the following contributors:
+@42wim, @jlu5, @qaisjp, @TheHolyRoger, @SuperSandro2000, @gary-kim, @z3bra, @greenx, @haykam821, @nathanaelhoun
+
 # v1.17.5
 
 ## Enhancements
diff --git a/matterbridge.go b/matterbridge.go
index 63fd12f7..e6646842 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	version = "1.17.6-dev"
+	version = "1.18.0"
 	githash string
 
 	flagConfig  = flag.String("conf", "matterbridge.toml", "config file")