Marcel f2eedf81f4 Merge branch 'imbris/648-cleanup' into 'master' ... Make handling of shortcut keywords for commands clearer and revise a TODO... Closes #648 See merge request veloren/veloren!2387		2021-06-07 10:27:54 +00:00
..
src	Merge branch 'imbris/648-cleanup' into 'master'	2021-06-07 10:27:54 +00:00
Cargo.toml	Revert "Merge branch 'sharp/revert-quinn' into 'master'"	2021-05-21 10:41:16 +02:00