TF-EssentialsX/Essentials
delbertina 127a7bb2ce Merge branch 'mutes385' of https://github.com/delbertina/Essentials into mutes385
Updated local copy
Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commandafk.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/commands/Commandseen.java
	Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
2017-12-17 00:02:52 -06:00
..
src Merge branch 'mutes385' of https://github.com/delbertina/Essentials into mutes385 2017-12-17 00:02:52 -06:00
test/com/earth2me/essentials Update to 1.12. :D 2017-06-18 19:54:04 +01:00
pom.xml Remove Supervisor support. 2017-05-04 13:55:18 +01:00