summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--changelog.md6
-rw-r--r--matterbridge.go2
3 files changed, 6 insertions, 4 deletions
diff --git a/README.md b/README.md
index ea85a91c..9259d41c 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ See https://github.com/42wim/matterbridge/wiki
## Installing
### Binaries
-* Latest stable release [v1.13.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.14.0](https://github.com/42wim/matterbridge/releases/latest)
* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
### Packages
diff --git a/changelog.md b/changelog.md
index 95012a8a..5e3e7c57 100644
--- a/changelog.md
+++ b/changelog.md
@@ -19,6 +19,8 @@
## Enhancements
* general: Fail gracefully on incorrect human input. Fixes #739 (#740)
+* matrix: Detect html nicks in RemoteNickFormat (matrix). Fixes #696 (#719)
+* matrix: Send notices on join/parts (matrix). Fixes #712 (#716)
## Bugfix
* general: Handle file upload/download only once for each message (#742)
@@ -27,9 +29,9 @@
* irc: add support for (older) unrealircd versions. #708
* irc: Support quits from irc correctly. Fixes #722 (#724)
* matrix: Send username when uploading video/images (matrix). Fixes #715 (#717)
-* matrix: Send notices on join/parts (matrix). Fixes #712 (#716)
-* matrix: Detect html nicks in RemoteNickFormat (matrix). Fixes #696 (#719)
+* matrix: Trim <p> and </p> tags (matrix). Closes #686 (#753)
* slack: Hint at thread replies when messages are unthreaded (slack) (#684)
+* slack: Fix race-condition in populateUser() (#767)
* xmpp: Do not send topic changes on connect (xmpp). Fixes #732 (#733)
* telegram: Fix regression in HTML handling (telegram). Closes #734
* discord: Do not relay any bot messages (discord) (#743)
diff --git a/matterbridge.go b/matterbridge.go
index 6dd78cde..eace0e05 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -15,7 +15,7 @@ import (
)
var (
- version = "1.14.0-rc2-dev"
+ version = "1.14.0"
githash string
flagConfig = flag.String("conf", "matterbridge.toml", "config file")