Marcel 3b7e3f8e74 Merge branch 'vfoulon80/trading-dialogues' into 'master' ... Add dialogue when the Merchant is busy and randomize some trading dialogues See merge request veloren/veloren!2038		2021-04-01 18:08:44 +00:00
..
src	Merge branch 'vfoulon80/trading-dialogues' into 'master'	2021-04-01 18:08:44 +00:00
Cargo.toml	Change the version number to 0.9	2021-03-20 13:07:09 +01:00