diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
| commit | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /model | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| parent | fbef16f8630f74248157c2cd9e546ece355c869a (diff) | |
| download | chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.gz chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.bz2 chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.zip | |
Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7
Diffstat (limited to 'model')
| -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 20011f7cb..7390b4fd9 100644 --- a/model/config.go +++ b/model/config.go @@ -2085,7 +2085,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) |