Sync with mattermost 3.1.0

2016-06-23 20:28:05 +02:00
parent e48db67649
commit 6ec77e06ea
22 changed files with 1237 additions and 556 deletions
--- a/vendor/github.com/42wim/matterbridge-plus/bridge/config.go
+++ b/vendor/github.com/42wim/matterbridge-plus/bridge/config.go
@@ -19,6 +19,7 @@ type Config struct {
 		NickServNick      string
 		NickServPassword  string
 		RemoteNickFormat  string
+		IgnoreNicks       string
 	}
 	Mattermost struct {
 		URL                    string
@@ -37,6 +38,8 @@ type Config struct {
 		Login                  string
 		Password               string
 		RemoteNickFormat       *string
+		IgnoreNicks            string
+		NoTLS                  bool
 	}
 	Token map[string]*struct {
 		IRCChannel string