ljacqu b4b679d3b9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email ...

Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/Management.java
	src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

2016-02-06 18:01:23 +01:00

..

java/fr/xephi/authme

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email

2016-02-06 18:01:23 +01:00

resources

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email

2016-02-06 18:01:23 +01:00