WolverinDEV 449df23a4b Merge branch '1.5.0' into new-groups
# 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
2021-03-01 19:22:15 +01:00
..
2021-02-07 12:27:40 +01:00
2020-12-02 23:40:36 +01:00
2021-03-01 19:22:15 +01:00
2020-02-28 11:24:07 +01:00
2021-01-24 11:26:43 +01:00
2020-01-24 02:57:58 +01:00
2020-02-15 14:03:46 +01:00
2020-05-03 14:06:34 +02:00
2020-01-24 02:57:58 +01:00