Marcel d4f993ca1d Merge branch 'minor-fixes' into 'master' ... Correct/improve some en-US text. See merge request veloren/veloren!4246		2024-01-21 10:12:20 +00:00
..
common	Merge branch 'crabman/earthsplitter-nerf' into 'master'	2024-01-20 18:30:55 +00:00
server/manifests	haniwa	2024-01-20 17:45:23 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'minor-fixes' into 'master'	2024-01-21 10:12:20 +00:00
world	haniwa	2024-01-20 17:45:23 +00:00