Marcel 6506a97dcd Merge branch 'zesterer/enable-site2-towns' into 'master' ... Enabled site2 towns by default See merge request veloren/veloren!3206		2022-02-20 14:02:53 +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 'zesterer/enable-site2-towns' into 'master'	2022-02-20 14:02:53 +00:00
world	Merge branch 'zesterer/enable-site2-towns' into 'master'	2022-02-20 14:02:53 +00:00