Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

Browse Source

# Conflicts:
#	src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
#	src/main/java/com/massivecraft/factions/missions/MissionHandler.java

...

This commit is contained in:

Driftay

2019-09-15 05:04:22 -04:00

parent d98f5d9723 7e9c6cead8

commit 978bcbbb3b

7 changed files with 598 additions and 583 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/main/java/com/massivecraft/factions/FactionsPlugin.java Normal file → Executable file