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-15 23:45:41 +02:00
2017-10-09 07:19:38 +02:00
2015-12-12 11:39:19 +01:00
2017-03-05 11:08:43 +01:00
2017-07-16 23:07:13 +02:00
2017-10-15 18:29:01 +02:00
2017-05-07 11:59:01 +02:00
2017-07-16 13:00:55 +02:00
2017-03-24 23:03:10 +01:00
2015-12-31 13:32:41 +01:00
2015-12-23 14:54:45 +01:00
2016-06-04 11:02:15 +02:00