Alejandro Fraguas b47e66d35b Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop' ... 'in-process' events can now inhibit alerts. See merge request artica/pandorafms!2624		2019-07-31 11:58:48 +02:00
..
pandora_server.conf.new	Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop'	2019-07-31 11:58:48 +02:00
pandora_server.conf.windows	Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop'	2019-07-31 11:58:48 +02:00
tentacle_server.conf.new	Modified launch daemon Tentacle script to use configuration file	2018-04-30 15:53:09 +02:00