Merge remote-tracking branch 'origin/master' · Chiarchiaooo/CommandBlocker@cc52e1a · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	src/main/java/it/chiarchiaooo/commandblocker/Commands/Arguments/HelpArgument.java
#	src/main/java/it/chiarchiaooo/commandblocker/Commands/Arguments/ReloadArgument.java
#	src/main/java/it/chiarchiaooo/commandblocker/Commands/Arguments/RestartArgument.java

Loading branch information

Chiarchiaooo committed Mar 9, 2022

2 parents af916b9 + fefcb55 commit cc52e1a