Merge remote-tracking branch 'origin/main'

2025-06-20 13:35:08 +02:00
parent a455aba1d5 67c4f5e96d
commit 46d5d7bf78
3 changed files with 40 additions and 0 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /.phpunit.cache
 /bootstrap/ssr
 /node_modules
@@ -22,3 +23,30 @@ yarn-error.log
 /.nova
 /.vscode
 /.zed
+=======
+# ---> Laravel
+/vendor/
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+
+# Laravel 5 & Lumen specific with changed public path
+public_html/storage
+public_html/hot
+
+storage/*.key
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
+.phpunit.result.cache
+
+>>>>>>> origin/main