diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2024-09-15 19:16:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-15 19:16:04 +0200 |
| commit | 3fe3f8d1f65002a39713e313fcec6c8c0e12b817 (patch) | |
| tree | 33a4c7c0ae9c1e7e93ccf6267d411b512dac84a5 /lib/private | |
| parent | 101891280b0ec855a08917764b80900a661e0957 (diff) | |
| parent | 7c1c02d6a540d7e923cfdefeaf01532562e7332c (diff) | |
| download | nextcloud-server-3fe3f8d1f65002a39713e313fcec6c8c0e12b817.tar.gz nextcloud-server-3fe3f8d1f65002a39713e313fcec6c8c0e12b817.zip | |
Merge pull request #48016 from nextcloud/fix/s3configtrait/proxy-false
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConfigTrait.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConfigTrait.php b/lib/private/Files/ObjectStore/S3ConfigTrait.php index 3a399e6413d..63f14ac2d00 100644 --- a/lib/private/Files/ObjectStore/S3ConfigTrait.php +++ b/lib/private/Files/ObjectStore/S3ConfigTrait.php @@ -20,7 +20,7 @@ trait S3ConfigTrait { protected int $timeout; - protected string $proxy; + protected string|false $proxy; protected string $storageClass; |