42f46b51d3
# Conflicts: # src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java # src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java