Merge branch 'main' into develop

filamentphp · Mar 2, 2021 · 2f8defc · 2f8defc
2 parents 6430d8b + 5dc612c
commit 2f8defc
Show file tree

Hide file tree

Showing 3 changed files with 9,013 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.phar
-composer.lock
 Thumbs.db
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
     <a href="https://github.com/laravel-filament/filament/actions"><img alt="Tests passing" src="https://img.shields.io/badge/Tests-passing-green?style=for-the-badge&logo=github"></a>
     <a href="https://laravel.com"><img alt="Laravel v8.x" src="https://img.shields.io/badge/Laravel-v8.x-FF2D20?style=for-the-badge&logo=laravel"></a>
     <a href="https://laravel-livewire.com"><img alt="Livewire v2.x" src="https://img.shields.io/badge/Livewire-v2.x-FB70A9?style=for-the-badge"></a>
-    <a href="https://php.net"><img alt="PHP 8" src="https://img.shields.io/badge/PHP-8-777BB4?style=for-the-badge&logo=php"></a>
+    <a href="https://php.net"><img alt="PHP 7.4" src="https://img.shields.io/badge/PHP-7.4-777BB4?style=for-the-badge&logo=php"></a>
 </p>
 
 Filament is a content management framework for rapidly building a beautiful administration interface designed for humans.