Samuel Keiffer a0599ac046 Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295		2021-05-21 20:28:53 +00:00
..
src	Merge branch 'sam/extra-equip-slots' into 'master'	2021-05-21 20:28:53 +00:00
Cargo.toml	Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"	2021-05-17 08:32:12 -07:00