philipmi fce3b46407 Merge remote-tracking branch 'origin/master' ... # Conflicts: # mods/ctf/ctf_map/ctf_map_core/maps		2021-09-25 21:58:09 +02:00
..
ctf	Merge remote-tracking branch 'origin/master'	2021-09-25 21:58:09 +02:00
mtg	Make clay do not drop clay lump (#885)	2021-05-26 07:18:45 -07:00
other	Merge branch 'master' of https://github.com/MT-CTF/capturetheflag	2021-06-23 16:06:50 +02:00
pvp	Update shooter submodule	2021-07-21 22:17:19 +02:00