Merge branch '1.6.x' of https://github.com/SaberLLC/Saber-Factions in… · SaberLLC/Saber-Factions@3c40269 · GitHub

Commit

Merge branch '1.6.x' of https://github.com/SaberLLC/Saber-Factions in…

Browse files

…to 1.6.x

# Conflicts:
#	src/main/java/com/massivecraft/factions/FactionsPlugin.java

Loading branch information

Driftay committed Oct 2, 2023

2 parents 65b789e + 3847c83 commit 3c40269