mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-11-23 18:55:11 +01:00
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
This commit is contained in:
commit
55bfceca31