Merge remote-tracking branch 'origin/master' into jsoncache-fix

Conflicts: src/main/java/fr/xephi/authme/AuthMe.java src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java
2016-06-29 05:00:16 +07:00
parent ad068ffba0 6b13f9d370
commit 98c8e00f5a
13 changed files with 53 additions and 75 deletions
@@ -3,6 +3,7 @@ package fr.xephi.authme.permission.handlers;
 /**
 * Exception during the instantiation of a {@link PermissionHandler}.
 */
+@SuppressWarnings("serial")
 public class PermissionHandlerException extends Exception {

    public PermissionHandlerException(String message) {