fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs ... 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		2019-11-22 15:49:07 +01:00
..
delete_files	Added delete_files entry for recon view deletion	2019-06-27 16:58:48 +02:00
mr	Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs	2019-11-22 15:49:07 +01:00
check_other_languages.sh	2012-10-09 Miguel de Dios <miguel.dedios@artica.es>	2012-10-09 15:51:33 +00:00
pandora_diag.php	continue feedback mail	2019-10-23 19:50:57 +02:00
pandoradb_migrate_5.1_to_6.0.mysql.sql	fixed change url update manager. Ticket #3809.	2016-06-15 11:10:57 +02:00
pandoradb_migrate_6.0_to_7.0.mysql.sql	Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs	2019-11-22 15:49:07 +01:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00