Skip to content

Commit 219076b

Browse files
author
CI bot
committed
Merge remote-tracking branch 'remotes/dev/5.0' into 5.0
2 parents 9eae8db + af1f051 commit 219076b

File tree

4 files changed

+520
-526
lines changed

4 files changed

+520
-526
lines changed

composer.json

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
"bin-dir": "bin",
6666
"fxp-asset": {
6767
"enabled": false
68+
},
69+
"allow-plugins": {
70+
"php-http/discovery": false
6871
}
6972
},
7073
"scripts": {

dev.json

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@
7777
"bin-dir": "bin",
7878
"fxp-asset": {
7979
"enabled": false
80+
},
81+
"allow-plugins": {
82+
"php-http/discovery": false
8083
}
8184
},
8285
"scripts": {

0 commit comments

Comments
 (0)