Marcel df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' ... Shared and persistent waypoints See merge request veloren/veloren!3162		2022-02-20 10:10:18 +00:00
..
common	Merge branch 'gnarlings' into 'master'	2022-02-15 00:22:37 +00:00
server/manifests	Addressed some review.	2022-01-03 19:55:04 -05:00
voxygen	Merge branch 'isse/shared-waypoints' into 'master'	2022-02-20 10:10:18 +00:00
world	Added location system, switched to release map	2022-02-17 14:51:59 +00:00