Files
LoginSystem/src/main/java
ljacqu 0283395da4 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into jsoncache-fix
Conflicts:
	src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java
2016-07-02 11:01:46 +02:00
..