Merge branch 'master' into bones_was_here/net_s7

author Cloudwalk <cloudwalk009@gmail.com>

Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)

committer Cloudwalk <cloudwalk009@gmail.com>

Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
author Cloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
committer Cloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
diff --cc server.h
Simple merge
diff --cc sv_main.c
Simple merge
author	Cloudwalk <cloudwalk009@gmail.com>
	Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Sat, 29 May 2021 18:18:06 +0000 (14:18 -0400)
		1	2
server.h	patch \|	diff1 \|	diff2 \|	blob \| history
sv_main.c	patch \|	diff1 \|	diff2 \|	blob \| history