Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums

Browse Source

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

parent 37a615fa03 ae3cf02c06

commit 55bfceca31

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

Diff Content Not Available