ljacqu af6bee59bd Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth ...

# Conflicts:
#	src/main/java/fr/xephi/authme/datasource/MySQL.java

2018-03-19 22:32:16 +01:00

..

fr/xephi/authme

Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

2018-03-19 22:32:16 +01:00