Merge branch '8.x'

# Conflicts: # CHANGELOG.md
2021-12-07 17:10:58 +01:00
parent fcb4d9df1a 7e78e26c7c
commit 274d1bdd72
15 changed files with 31 additions and 21 deletions
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
            "@php artisan package:discover --ansi"
        ],
        "post-update-cmd": [
-            "@php artisan vendor:publish --tag=laravel-assets --ansi"
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
        ],
        "post-root-package-install": [
            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""