5423e78d62
Conflicts: pandora_console/extras/mr/33.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/agentes/configurar_agente.php pandora_console/godmode/wizards/Wizard.main.php pandora_console/include/functions_agents.php pandora_console/include/styles/alert.css pandora_console/pandoradb.sql pandora_server/lib/PandoraFMS/Recon/Base.pm |
||
---|---|---|
.. | ||
DiscoveryTaskList.class.php | ||
HostDevices.class.php | ||
Wizard.main.php | ||
index.php |