ljacqu 4d8d9de733 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
Conflicts:
	src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
2015-12-12 14:25:01 +01:00
..
2015-12-12 20:16:59 +07:00
2015-12-11 12:16:29 +07:00
2015-11-25 15:39:15 +01:00
2015-12-11 21:47:19 +07:00
2015-12-08 20:52:45 +01:00
2015-12-04 23:47:48 +01:00