Mars 984339ce42 Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

..

observer

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

death.dm

…