commit f52055e9c7bf9d49f559e1405babb84da2e0e1c0
Author: Wim <wim@42.be>
Date: Sat Aug 05 15:50:21 2017 +0000
Release v1.0.0
diff --git a/README.md b/README.md
index 409628a..cb642e0 100644
--- a/README.md
+++ b/README.md
@@ -537 +537 @@ See https://github.com/42wim/matterbridge/wiki
# Installing
## Binaries
-* Latest stable release [v1.0.0-rc1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.0.0](https://github.com/42wim/matterbridge/releases/latest)
* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
## Building
diff --git a/changelog.md b/changelog.md
index 14c10a7..ff7089e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13 +18 @@
+# v1.0.0
+## New features
+* general: Add action support for slack,mattermost,irc,gitter,matrix,xmpp,discord. #199
+* discord: Shows the username instead of the server nickname #234
+
# v1.0.0-rc1
## New features
* general: Add action support for slack,mattermost,irc,gitter,matrix,xmpp,discord. #199
diff --git a/matterbridge.go b/matterbridge.go
index a1965af..73ccfc9 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -514 +513 @@ import (
"fmt"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/gateway"
- //"github.com/42wim/matterbridge/gateway/samechannel"
log "github.com/Sirupsen/logrus"
"github.com/google/gops/agent"
"strings"
)
var (
- version = "1.0.0-rc1"
+ version = "1.0.0"
githash string
)
