Merge with 2.0.0-m3

This commit is contained in:
René Pfeuffer
2019-06-06 15:44:57 +02:00
20 changed files with 4019 additions and 2556 deletions

View File

@@ -63,7 +63,9 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
return;
}
XmlGroupV1UpdateStep.V1GroupDatabase v1Database = readV1Database(v1GroupsFile.get());
v1Database.groupList.groups.forEach(this::update);
if (v1Database.groupList != null && v1Database.groupList.groups != null) {
v1Database.groupList.groups.forEach(this::update);
}
}
@Override