Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into '450-new-settings-rewrite'

Browse Source 
Conflicts:
  - PerformBackup.java
  - Settings.java
This commit is contained in:
ljacqu
2016-01-31 21:31:42 +01:00
parent 42ae30ed3a b299e4be91
commit 155881ef05
14 changed files with 48 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/CommandMapper.java
-2
View File
@@ -1,8 +1,6 @@
package fr.xephi.authme.command;
import fr.xephi.authme.command.executable.HelpCommand;
import fr.xephi.authme.command.help.HelpProvider;
import fr.xephi.authme.output.Messages;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.util.CollectionUtils;
import fr.xephi.authme.util.StringUtils;