Merge branch 'master' into develop

Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Nov 17, 2024 · 845b5ec · 845b5ec
2 parents 7f4adf8 + 9bd9cb6
commit 845b5ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor
+.phpunit.cache
 composer.lock
 /phpunit.xml
 .phpunit.result.cache

diff --git a/composer.json b/composer.json
@@ -39,7 +39,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-develop": "2.x-dev",
+            "dev-master": "1.x-dev"
         }
     },
     "config": {