Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name ... Conflicts: pandora_agents/unix/pandora_agent pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql pandora_console/godmode/agentes/agent_manager.php pandora_console/godmode/agentes/modificar_agente.php pandora_console/godmode/agentes/planned_downtime.editor.php pandora_console/godmode/massive/massive_delete_modules.php pandora_console/godmode/massive/massive_edit_modules.php pandora_console/include/class/Tree.class.php pandora_console/include/functions_graph.php pandora_console/include/functions_treeview.php pandora_console/include/functions_ui.php pandora_console/operation/agentes/estado_agente.php pandora_console/operation/agentes/status_monitor.php pandora_console/pandoradb.sql		2017-02-16 16:05:21 +01:00
..
Tree.class.php	Merge branch 'develop' into feature/alias_freandly_name	2017-02-16 16:05:21 +01:00