From 8b26e42a3adb11087cf427671f2d65498a46074f Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 5 Sep 2020 00:02:37 +0200
Subject: [PATCH] Release v1.18.3 (#1229)

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

diff --git a/README.md b/README.md
index 52c0764a..66ce3b65 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ See <https://github.com/42wim/matterbridge/wiki>
 
 ### Binaries
 
-- Latest stable release [v1.18.2](https://github.com/42wim/matterbridge/releases/latest)
+- Latest stable release [v1.18.3](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 7eb88fe1..8b4ba2f4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,23 @@
+# v1.18.3
+
+## Enhancements
+
+- nctalk: Add TLSConfig to nctalk (#1195)
+- whatsapp: Handle broadcasts as groups in Whatsapp #1213
+- matrix: switch to upstream gomatrix #1219
+- api: support multiple websocket clients #1205
+
+## Bugfix
+
+- general: update vendor
+- zulip: Check location of avatarURL (zulip). Fixes #1214 (#1227)
+- nctalk: Fix issue with too many open files #1223
+- nctalk: Fix mentions #1222
+- nctalk: Fix message replays #1220
+
+This release couldn't exist without the following contributors:
+@gary-kim, @tilosp, @NikkyAI, @escoand, @42wim
+
 # v1.18.2
 
 ## Bugfix
diff --git a/matterbridge.go b/matterbridge.go
index 5c957636..8a7d2df7 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	version = "1.18.2"
+	version = "1.18.3"
 	githash string
 
 	flagConfig  = flag.String("conf", "matterbridge.toml", "config file")