Merge branch 'master' into Mario/survival

author Mario <mario.mario@y7mail.com>

Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)

committer Mario <mario.mario@y7mail.com>

Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)
author Mario <mario.mario@y7mail.com>
Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)
committer Mario <mario.mario@y7mail.com>
Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)
diff --cc gamemodes-server.cfg
Simple merge
diff --cc notifications.cfg
Simple merge
diff --cc qcsrc/common/notifications/all.inc
Simple merge
diff --cc qcsrc/common/notifications/all.qh
Simple merge
diff --cc qcsrc/menu/xonotic/util.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)
committer	Mario <mario.mario@y7mail.com>
	Thu, 1 Sep 2022 13:04:00 +0000 (23:04 +1000)
		1	2
gamemodes-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
notifications.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	patch \|	diff1 \|	diff2 \|	blob \| history