diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 12:58:36 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 12:58:36 -0500 |
| commit | cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257 (patch) | |
| tree | 14e8058293bf6b0a6fb7ab84df7c92dbd2beb96b /model/config.go | |
| parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
| parent | e43f381764bdf29117760b26c88fd37b716e67b2 (diff) | |
| download | chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.tar.gz chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.tar.bz2 chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.zip | |
Merge branch 'release-4.7-t3merge3'
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) |