Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.5' into 2.2
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/lib/Menu/UserMenuBuilder.php
  • Loading branch information
@barw4
barw4 committed May 25, 2021
2 parents c7097e0 + 372973e commit d30d627
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d30d627

Please sign in to comment.