diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 23:20:27 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 23:20:27 -0500 |
| commit | 4e4535bda9c7ce8609a2101037cda9a29407756c (patch) | |
| tree | ed1fb75336261b24a30a85fea623e829c944b8d1 /model/config.go | |
| parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
| parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
| download | chat-4e4535bda9c7ce8609a2101037cda9a29407756c.tar.gz chat-4e4535bda9c7ce8609a2101037cda9a29407756c.tar.bz2 chat-4e4535bda9c7ce8609a2101037cda9a29407756c.zip | |
Merge release-4.7 with master in side branch
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index 9010eaeae..898099d12 100644 --- a/model/config.go +++ b/model/config.go @@ -2096,7 +2096,7 @@ func (ss *ServiceSettings) isValid() *AppError { } switch *ss.ImageProxyType { - case "", "willnorris/imageproxy": + case "": case "atmos/camo": if *ss.ImageProxyOptions == "" { return NewAppError("Config.IsValid", "model.config.is_valid.atmos_camo_image_proxy_options.app_error", nil, "", http.StatusBadRequest) |