Skip to content
Commit f1456bd4 authored by sunse's avatar sunse
Browse files

Merge branch '28.111_Rel18_Add_alarmType_other' into 'Integration_Rel18_SA5_161_YAML' 

28.111_CR0042_Rel18_Add_alarmType_other into Integration

See merge request !1716
parents 21569710 ef406d4c