git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	bones_was_here <bones_was_here@xonotic.au>
	Sat, 10 Feb 2024 09:00:45 +0000 (09:00 +0000)
committer	bones_was_here <bones_was_here@xonotic.au>
	Sat, 10 Feb 2024 09:00:45 +0000 (09:00 +0000)
commit	80e689b0a1ff02914edaa3773358253b7d18c7fc
tree	f28d28d14e9cc73f09464cfda2ebf55b05cbf80d	tree \| snapshot
parent	0ca6306558a71a8b7fb5b62fc856d910506b187b	commit \| diff
parent	2df7dc4e21b118ecf61774aad7bbdb585a24274f	commit \| diff

Merge branch 'Spike29/balance_council_vote19' into 'master'

Apply the balance council vote 19

See merge request xonotic/xonotic-data.pk3dir!1260