ljacqu 7a43703d52 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into antibot-improvement ...

Conflicts:
	src/main/java/fr/xephi/authme/service/AntiBotService.java

2016-10-30 08:58:26 +01:00

..

java/fr/xephi/authme

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

2016-10-30 08:58:26 +01:00

resources

Remove wrong header from BR help file

2016-10-29 14:00:51 +02:00