DNx5 93484a3449 Merge remote-tracking branch 'origin/master' into authme-process ...

Conflicts:
	src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
	src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
	src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
	src/main/java/fr/xephi/authme/settings/Settings.java

2015-12-05 03:23:50 +07:00

..

CustomConfiguration.java

Improved and updated the custom configuration class

2015-11-25 01:32:11 +01:00

OtherAccounts.java

Improved and updated the custom configuration class

2015-11-25 01:32:11 +01:00

Settings.java

Merge remote-tracking branch 'origin/master' into authme-process

2015-12-05 03:23:50 +07:00

Spawn.java

cleanup

2015-11-25 15:39:15 +01:00