ljacqu 689e5eeccc Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo ...

# Conflicts:
#	src/main/java/fr/xephi/authme/command/executable/authme/debug/DebugCommand.java

2017-03-12 14:54:25 +01:00

..

fr/xephi/authme

Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo

2017-03-12 14:54:25 +01:00