Joshua Barretto da9b23d4f6 Merge branch 'knarkzel/fix-npc-spawn' into 'master' ... Fix bug that caused campfires and other stuff to duplicate See merge request veloren/veloren!1543		2020-11-22 21:03:06 +00:00
..
src	Merge branch 'knarkzel/fix-npc-spawn' into 'master'	2020-11-22 21:03:06 +00:00
Cargo.toml	ci cleanup, dependency update	2020-11-06 14:34:42 +01:00