Merge branch 'master' into upgrade-vue3

# Conflicts: # composer.lock # resources/js/Pages/Users/Create.vue # resources/js/Pages/Users/Edit.vue
2021-12-08 18:03:24 +01:00 · 2021-12-08 18:03:24 +01:00 · 55a12a5b38
parent 74ee153357 839c6a0ed8
commit 55a12a5b38
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -5,7 +5,7 @@
    "keywords": ["framework", "laravel"],
    "license": "MIT",
    "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
        "ext-exif": "*",
        "ext-gd": "*",
        "fruitcake/laravel-cors": "^2.0",