Skip to content

Commit

Permalink
Merge branch '2.x.x' into fix-ordering-2
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/Traits/GenericActionsTrait.php
  • Loading branch information
@nicolocarpignoli
nicolocarpignoli committed Jan 4, 2023
2 parents 5fe023e + 8c5b63a commit 5f2bad2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5f2bad2

Please sign in to comment.