Marcel 2a9f75340a Merge branch 'spanish_translation' into 'master' ... apply changes from MR!2904 See merge request veloren/veloren!3224		2022-02-20 16:26:24 +00:00
..
common	apply changes from MR!2904	2022-02-20 10:18:24 +01:00
server/manifests	Addressed some review.	2022-01-03 19:55:04 -05:00
voxygen	Merge branch 'spanish_translation' into 'master'	2022-02-20 16:26:24 +00:00
world	Merge branch 'zesterer/enable-site2-towns' into 'master'	2022-02-20 14:02:53 +00:00