fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/include/constants.php pandora_server/lib/PandoraFMS/Tools.pm		2021-10-26 14:21:40 +02:00
..
pandora_server.conf.new	Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card	2021-10-26 14:21:40 +02:00
pandora_server.conf.windows	Read event_replication from the database.	2021-09-20 13:25:02 +02:00
tentacle_server.conf.new	Changed new wiki url on helps	2021-06-24 12:31:15 +00:00