Merge branch 'develop' into dev-express-alarm

This commit is contained in:
Bastian Schroll 2017-12-18 13:22:08 +01:00 committed by GitHub
commit e9b7cf17ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 18 deletions

View file

@ -128,6 +128,8 @@ ricd = Unwetter
# RIC for net identification
# Usually sent periodically, separated by comma
netIdent_ric = 0174760, 1398098
# you can hold one entry per netIdent_ric [0] or the whole history [1]
netIdent_history = 0
[multicastAlarm]