Skip to content

Commit

Permalink
Merge branch '3.x' into 3.next-merge
Browse files Browse the repository at this point in the history
# Conflicts:
#	.phive/phars.xml
  • Loading branch information
LordSimal committed Sep 13, 2024
2 parents ac26976 + c7f1806 commit bcca4f6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpstan" version="1.11.6" installed="1.11.6" location="./tools/phpstan" copy="false"/>
<phar name="phpstan" version="1.11.9" installed="1.11.9" location="./tools/phpstan" copy="false"/>
<phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
</phive>

0 comments on commit bcca4f6

Please sign in to comment.