Merge branch '3.2' into 3

This commit is contained in:
Steve Boyd 2021-05-21 14:30:19 +12:00
commit 90d4812aa8

View File

@ -38,11 +38,7 @@
"suggest": { "suggest": {
"ext-fileinfo": "Improved support for file mime detection" "ext-fileinfo": "Improved support for file mime detection"
}, },
"extra": { "extra": [],
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }