Justin Shipsey 56f8e66d5d Merge branch 'steanne-master-patch-91284' into 'master' ... Update _manifest.ron for minor typos in villager statements See merge request veloren/veloren!1807		2021-02-22 22:10:38 +00:00
..
common	Removed duplicate possess stick	2021-02-20 17:12:27 -05:00
voxygen	Merge branch 'steanne-master-patch-91284' into 'master'	2021-02-22 22:10:38 +00:00
world	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00