Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.x' into 7.x 

# Conflicts:
#	composer.json
This commit is contained in:
Dries Vints 2020-10-29 17:01:22 +01:00
parent 482d68a182 27338d9a99
commit 9af70cffa4
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -20,7 +20,7 @@
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^4.1",
"phpunit/phpunit": "^8.5"
"phpunit/phpunit": "^8.5|^9.3"
},
"config": {
"optimize-autoloader": true,