Skip to content

Commit

Permalink
Merge branch 'master' into rewrite
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
#	src/main/java/pl/arturekdev/mineEconomy/commands/RankingCommand.java
  • Loading branch information
arthurr0 committed Oct 2, 2021
2 parents 05de354 + a607c35 commit 79cfe32
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 79cfe32

Please sign in to comment.