Marcel 4beb732630 Merge branch 'update-pt_BR' into 'master' ... Update pt br - 2021-01-30 See merge request veloren/veloren!3785		2023-01-31 22:32:41 +00:00
..
common	Merge branch 'wyvern_wings' into 'master'	2023-01-28 21:25:17 +00:00
server/manifests	dark_guitar & icy_talharpa	2023-01-13 13:37:45 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'update-pt_BR' into 'master'	2023-01-31 22:32:41 +00:00
world	reduce mossdrake, fix woodgolem loottable	2022-11-21 14:22:15 +00:00