veloren/server
Marcel eabddd7263 Merge branch 'christof/trading_fix2' into 'master'
fix merchant getting stuck in non-existant trade when declining after accepting

See merge request veloren/veloren!1941
2021-03-19 09:29:45 +00:00
..
src Merge branch 'christof/trading_fix2' into 'master' 2021-03-19 09:29:45 +00:00
Cargo.toml scan_fmt -> 0.2.6 2021-03-15 17:48:21 -05:00