Conflicts:
	src/main/java/fr/xephi/authme/AntiBot.java
	src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
This commit is contained in:
Lucas Jacques 2015-11-25 19:51:34 +01:00
commit 55bfceca31

Diff Content Not Available