atasistro
/
pingcrm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into upgrade-vue3 

# Conflicts:
#	composer.lock
#	resources/js/Pages/Users/Create.vue
#	resources/js/Pages/Users/Edit.vue
This commit is contained in:
Claudio Dekker 2021-12-08 18:03:24 +01:00
parent 74ee153357 839c6a0ed8
commit 55a12a5b38
No known key found for this signature in database
GPG Key ID: 6ACA8683E402B133
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

@ -5,7 +5,7 @@
"keywords": ["framework", "laravel"], "keywords": ["framework", "laravel"],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.3|^8.0", "php": "^7.4|^8.0",
"ext-exif": "*", "ext-exif": "*",
"ext-gd": "*", "ext-gd": "*",
"fruitcake/laravel-cors": "^2.0", "fruitcake/laravel-cors": "^2.0",