Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
LoginSystem/src/main/java/fr
History
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
..
xephi/authme
Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
2015-12-12 14:25:01 +01:00