ljacqu
90073ef95d
Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 792-registration-date-and-ip
Conflicts:
src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
src/main/java/fr/xephi/authme/datasource/Columns.java
src/main/java/fr/xephi/authme/datasource/SQLite.java
src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
src/main/java/fr/xephi/authme/service/SessionService.java
src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
src/test/java/fr/xephi/authme/service/SessionServiceTest.java
src/test/resources/fr/xephi/authme/datasource/sql-initialize.sql