Merge branch 'master' into develop

crynobone · crynobone · commit 845b5ecbf95c · 2024-11-17T20:51:27.000+08:00
Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;
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": {
