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
2017-10-15 23:45:41 +02:00
..
2017-10-05 23:44:16 +02:00
2017-05-07 11:59:01 +02:00
2017-10-15 18:32:51 +02:00
2017-10-15 23:45:41 +02:00
2017-10-15 18:32:51 +02:00
2017-10-15 23:45:41 +02:00
2017-10-14 17:37:34 +02:00
2017-04-29 22:37:34 +02:00
2016-05-20 19:42:30 +02:00
2017-10-04 20:12:53 +02:00
2016-05-20 19:42:30 +02:00
2017-05-21 13:44:28 +02:00