Skip to content
Snippets Groups Projects
Commit 60cd6fe9 authored by LJ Sonic's avatar LJ Sonic
Browse files

Merge branch 'next' into 'resend-gamestate'

# Conflicts:
#   src/d_clisrv.c
parents 46d8546f 76bda716
Branches
Tags
1 merge request!829Resend gamestate when resynching
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment