Merge branch 'master' into ssh_agent_support

This commit is contained in:
2020-12-13 22:17:55 -06:00
2 changed files with 14 additions and 2 deletions

View File

@@ -25,7 +25,7 @@ public class ServerFactory implements Function<JsonObject, Server> {
.orElse("webdav");
if (type.equals("webdav")) {
return makeWebDavServer(object);
return makeWebDavServer(object);
} else if (type.equalsIgnoreCase("gofile")) {
return new GoFileServer(Optional.ofNullable(object.getAsJsonPrimitive("label")).map(JsonPrimitive::getAsString).orElse("GoFile"));
} else if (type.equalsIgnoreCase("ftp")) {