Marcel b4cf3297a4 Merge branch 'ismail.assaidi/fr' into 'master' ... Ismail.assaidi/fr See merge request veloren/veloren!1210		2020-07-16 11:34:38 +00:00
..
common	Fix item images, cleanup debug items folder	2020-07-16 02:46:10 +00:00
voxygen	Merge branch 'ismail.assaidi/fr' into 'master'	2020-07-16 11:34:38 +00:00
world	Added 36 Swords	2020-05-29 18:23:00 +00:00