Marcel 34c12092cc Merge branch 'Samuellm93-master-patch-97383' into 'master' ... Update common.ron pt_BR. Added some variables and edited a few. See merge request veloren/veloren!3387		2022-05-22 13:11:57 +00:00
..
common	Add Thai translation	2022-05-22 10:06:36 +00:00
server/manifests	Tweaks for this week	2022-05-19 19:35:31 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'Samuellm93-master-patch-97383' into 'master'	2022-05-22 13:11:57 +00:00
world	Fixed bad entity spawns	2022-05-10 23:25:22 +00:00