diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
| commit | 415145d62fd5195fc03759b5b4ed42c255529d7b (patch) | |
| tree | 11e7149396fdbff3efc6c06c536ada1f2a89bd64 /model | |
| parent | 5e2b4d1282dc374b54ca2c77fbf84c6533ce8519 (diff) | |
| parent | 09d98b486e8245ae84a452331e36e2978a6d01ab (diff) | |
| download | chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.gz chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.bz2 chat-415145d62fd5195fc03759b5b4ed42c255529d7b.zip | |
Merge branch 'release-3.3'
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 2 | ||||
| -rw-r--r-- | model/version.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index 7fe575e58..61d13360c 100644 --- a/model/config.go +++ b/model/config.go @@ -1001,7 +1001,7 @@ func (o *Config) IsValid() *AppError { } if *o.SamlSettings.Enable { - if len(*o.SamlSettings.IdpUrl) == 0 || !IsValidHttpUrl(*o.SamlSettings.IdpDescriptorUrl) { + if len(*o.SamlSettings.IdpUrl) == 0 || !IsValidHttpUrl(*o.SamlSettings.IdpUrl) { return NewLocAppError("Config.IsValid", "model.config.is_valid.saml_idp_url.app_error", nil, "") } diff --git a/model/version.go b/model/version.go index c6f49525b..49e8af048 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "3.3.0", "3.2.0", "3.1.0", "3.0.0", |