Merge branch 'martin-t/flag' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 14:05:57 +0000 (14:05 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 14:05:57 +0000 (14:05 +0000)
commit8121bbc66f59f5c03939e3ce60575fcbc30ef764
treeecb12c15a6faa963ba9007d229d7fc7bbd9aa254
parent182f36181c02ffe672d495d1186e449f4347251d
parent1024b5c1d847fe26c44ee065abd646753d423d05
Merge branch 'martin-t/flag' into 'master'

Allow 3 flag throws in ctf

See merge request !470