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

..

auth

#1141 Add TOTP key field to database and PlayerAuth

2018-03-05 19:50:58 +01:00

captcha

#930 Register captcha: avoid circular dependency by handling limbo message in captcha command

2018-01-06 19:04:03 +01:00

limbo

#829 Move CommandSender / name to first argument to avoid confusion with varargs

2018-03-10 16:58:30 +01:00

TempbanManager.java

#829 Move CommandSender / name to first argument to avoid confusion with varargs

2018-03-10 16:58:30 +01:00

VerificationCodeManager.java

Email verification code (#1382)

2017-10-28 12:23:14 +02:00