summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-07-15 23:23:32 +0200
committerWim <wim@42.be>2019-07-15 23:23:32 +0200
commitff27746c0ce54fe9fa38d30aa3a6eab4385e6555 (patch)
tree4c39dfaea085bfb9977c76da67dcce2e1fb45c87
parent87788f354f796c8ed93d2ef9318002b056a74577 (diff)
downloadmatterbridge-msglm-ff27746c0ce54fe9fa38d30aa3a6eab4385e6555.tar.gz
matterbridge-msglm-ff27746c0ce54fe9fa38d30aa3a6eab4385e6555.tar.bz2
matterbridge-msglm-ff27746c0ce54fe9fa38d30aa3a6eab4385e6555.zip
Bump version
-rw-r--r--changelog.md3
-rw-r--r--matterbridge.go2
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md
index e54a8095..19de6e92 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,9 @@
* xmpp: fix segfault when disconnected/reconnected #856
* telegram: fix panic in handleEntities #858
+This release couldn't exist without the following contributors:
+@42wim, @qaisjp, @joohoi
+
# v1.15.0
## New features
* Add scripting (tengo) support for every outgoing message (#806)
diff --git a/matterbridge.go b/matterbridge.go
index 2c265091..62a7f34b 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -15,7 +15,7 @@ import (
)
var (
- version = "1.15.1"
+ version = "1.15.2-dev"
githash string
flagConfig = flag.String("conf", "matterbridge.toml", "config file")