Marcel d25508e2df Merge branch 'lausek/admin-joining' into 'master' ... fix #660; Admins should join even if they aren't on whitelist Closes #660 See merge request veloren/veloren!1219		2020-07-23 17:16:52 +00:00
..
src	Merge branch 'lausek/admin-joining' into 'master'	2020-07-23 17:16:52 +00:00
Cargo.toml	make prometheus optional in network and fix a panic in the server	2020-07-15 16:45:49 +02:00