Merge branch 'terencehill/boil_trigger_hurt' into 'master'
authorMirio <opivy@hotmail.de>
Sat, 5 Aug 2017 16:02:40 +0000 (16:02 +0000)
committerMirio <opivy@hotmail.de>
Sat, 5 Aug 2017 16:02:40 +0000 (16:02 +0000)
commit80aef22bc82e5bb0a145e1a16c788a742bf2a6c7
tree60ac0d94398ae611f8f7dc6c0a7756c22c538894
parent08c1a7d06ec5d8f633980a8c3b0ecd781f68d68a
parentc92b1b216354b56367e37c5ce84cd93c4aa78b36
Merge branch 'terencehill/boil_trigger_hurt' into 'master'

Boil: move trigger_hurt down

See merge request !103