Samuel Keiffer dab040baa4 Merge branch 'trade-thirdconfirm' into 'master' ... Added additional confirmation when trading for nothing. See merge request veloren/veloren!3997		2023-07-03 23:45:59 +00:00
..
common	Small balance changes	2023-06-19 01:16:42 +00:00
server/manifests	seachapel_rework	2023-05-24 18:13:29 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'trade-thirdconfirm' into 'master'	2023-07-03 23:45:59 +00:00
world	wildlife_spawn_work	2023-07-03 23:21:56 +00:00