philipmi fef2d8ca0a Merge branch 'master' of https://github.com/MT-CTF/capturetheflag ... Conflicts: mods/ctf/ctf_map/ctf_map_core/maps		2021-09-25 22:24:53 +02:00
..
ctf	Merge branch 'master' of https://github.com/MT-CTF/capturetheflag	2021-09-25 22:24:53 +02:00
mtg	MTG: Optionally use 9 sliced background (#924)	2021-08-29 09:06:18 -07:00
other	Merge branch 'master' of https://github.com/MT-CTF/capturetheflag	2021-06-23 16:06:50 +02:00
pvp	Revert "Rework melee damage (#878)" (#925)	2021-09-03 16:20:18 -07:00