Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event' ... # Conflicts: # pandora_console/extras/mr/40.sql		2020-07-15 09:30:35 +02:00
..
delete_files	Remove file - old cluster files	2020-05-22 14:15:10 +02:00
mr	Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event'	2020-07-15 09:30:35 +02:00
check_other_languages.sh	…
pandora_diag.php	continue feedback mail	2019-10-23 19:50:57 +02:00
pandoradb_migrate_5.1_to_6.0.mysql.sql	…
pandoradb_migrate_6.0_to_7.0.mysql.sql	MR changes	2020-07-09 16:56:51 +02:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00