ljacqu 4a85eedd2c Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite ...

# Conflicts:
#	src/main/java/fr/xephi/authme/AuthMe.java

2016-01-17 12:35:14 +01:00

..

xephi/authme

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

2016-01-17 12:35:14 +01:00