Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/data/TextHolderProviderImpl.java
  • Loading branch information
@alexdev03
alexdev03 committed Jun 25, 2024
2 parents 334ab43 + 9b6343e commit 384002f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 384002f

Please sign in to comment.