ljacqu 7dd1d52893 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 547-process-architecture ...

Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java

2016-02-28 09:08:35 +01:00

..

java/fr/xephi/authme

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 547-process-architecture

2016-02-28 09:08:35 +01:00

resources

#457 Improve ForceFlatToSqlite conversion

2016-02-27 11:24:47 +01:00