Commit 339965f6 authored by Capucho's avatar Capucho

Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren...

Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout

Fixed conflicts
parents a9580a81 a391f2e0
Pipeline #125070907 canceled with stages
......@@ -287,6 +287,9 @@ impl<'a> System<'a> for Sys {
ClientMsg::Terminate => {
server_emitter.emit(ServerEvent::ClientDisconnect(entity));
},
ClientMsg::Terminate => {
server_emitter.emit(ServerEvent::ClientDisconnect(entity));
},
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment