Justin Shipsey a8ac051f33 Merge branch 'james/axe-hammer-keyframes' into 'master' ... James/axe hammer keyframes See merge request veloren/veloren!1497		2020-11-10 01:03:11 +00:00
..
common	Fixed sneaky admin sword.	2020-11-08 13:58:23 -06:00
voxygen	Merge branch 'james/axe-hammer-keyframes' into 'master'	2020-11-10 01:03:11 +00:00
world	Updated changelog, removed old models	2020-11-09 17:19:29 +00:00