ljacqu cf1032d936 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 784-purgeservice-architecture
Conflicts:
	src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java
2016-07-18 20:13:43 +02:00
..
2016-05-04 17:26:58 +02:00
2016-07-09 09:24:25 +02:00
2016-06-15 21:24:57 +02:00