449df23a4b
# Conflicts: # server/src/Group.h # server/src/InstanceHandler.cpp # server/src/InstanceHandler.h # server/src/VirtualServer.cpp # server/src/client/DataClient.cpp # server/src/client/DataClient.h