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

Merge branch 'master' into develop 

# Conflicts:
#	composer.json
This commit is contained in:
Dries Vints 2020-10-27 16:19:11 +01:00
parent d1c60201e8 b322096379
commit 554c079988
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

@ -8,7 +8,7 @@
],
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"fideloper/proxy": "^4.4.1",
"fruitcake/laravel-cors": "^2.0.3",
"guzzlehttp/guzzle": "^7.0.1",