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

..

java

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

2016-07-02 11:01:46 +02:00

resources/fr/xephi/authme

#813 Move test resources to conform to package structure

2016-07-02 10:57:30 +02:00