Skip to content

Commit

Permalink
Merge branch '2.x' into feature/craft-5-support
Browse files Browse the repository at this point in the history 
# Conflicts:
#	composer.lock
  • Loading branch information
@brandonkelly
brandonkelly committed Mar 19, 2024
2 parents 8441c46 + 3117d5f commit 00e60e6
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 00e60e6

Please sign in to comment.