summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-12-22 12:42:05 +0100
committerRemi Collet <remi@remirepo.net>2020-12-22 12:42:05 +0100
commit240c2bc4656379259b54e9ab38883f6635dc5098 (patch)
tree349890ee523e7ae98e8a7dcbe6582e9a3a83880a /composer.json
parent108eb5f74f61001491fcdde9045d58b6a37694c3 (diff)
update to 3.7.0HEADmaster
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index bab9875..16fdb8a 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"symfony/http-kernel": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
- "async-aws/flysystem-s3": "^0.4.0",
+ "async-aws/flysystem-s3": "^1.0",
"jenko/flysystem-gaufrette": "^1.0",
"league/flysystem-aws-s3-v2": "^1.0",
"league/flysystem-azure-blob-storage": "^0.1",
@@ -75,6 +75,9 @@
"superbalist/flysystem-google-storage": "Allows you to use Google Cloud Storage buckets",
"twistor/flysystem-stream-wrapper": "Allows you to use stream wrapper"
},
+ "conflict": {
+ "async-aws/flysystem-s3": "<1.0"
+ },
"config": {
"sort-packages": true
},