Commit Graph
3 Commits
Author SHA1 Message Date
Lucas Jacques 5f9ba208de Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums 2015-11-25 19:52:15 +01:00
Lucas Jacques 55bfceca31 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums
Conflicts:
	src/main/java/fr/xephi/authme/AntiBot.java
	src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
2015-11-25 19:51:34 +01:00
Lucas Jacques 37a615fa03 Create test that AntiBot is not enabled if Settings disable it 2015-11-25 19:39:16 +01:00