-
Capucho authored
Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout Fixed conflicts
339965f6
Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout Fixed conflicts