Justin Shipsey e8b4b29d70 Merge branch 'scott-c/1h-fixes' into 'master' ... 1h fixes See merge request veloren/veloren!1158		2020-07-07 15:29:33 +00:00
..
char_selection	Merge branch 'scott-c/1h-fixes' into 'master'	2020-07-07 15:29:33 +00:00
main	instead of trying to connect for 80 minutes, just try 4 mins, added Changelog	2020-07-04 12:37:50 +02:00
mod.rs	remove title screen	2019-03-29 03:34:33 -04:00