From 601b8bc98da9bdf36176369200d532aa9d73dc82 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 16 Jun 2019 16:32:06 +0200
Subject: [PATCH] Update documentation and changelog

---
 changelog.md             | 6 ++++++
 matterbridge.toml.sample | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/changelog.md b/changelog.md
index 4673eba3..f5cdfce2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+# dev
+## Enhancements
+* discord: Support bulk deletions #851
+* mattermost: Add an option to skip the Mattermost server version check #849
+
+
 # v1.15.0
 ## New features
 * Add scripting (tengo) support for every outgoing message (#806)
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 7dd12e44..2aa203db 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -350,6 +350,12 @@ NickFormatter="plain"
 #OPTIONAL (default 4)
 NicksPerRow=4
 
+#Skip the Mattermost server version checks that are normally done when connecting.
+#The usage scenario for this feature would be when the Mattermost instance is hosted behind a
+#reverse proxy that suppresses "non-standard" response headers in flight.
+#OPTIONAL (default false)
+SkipVersionCheck=false
+
 #Whether to prefix messages from other bridges to mattermost with the sender's nick. 
 #Useful if username overrides for incoming webhooks isn't enabled on the 
 #mattermost server. If you set PrefixMessagesWithNick to true, each message