Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' ... # Conflicts: # pandora_console/extras/mr/45.sql # pandora_console/godmode/alerts/configure_alert_action.php # pandora_server/util/pandora_db.pl		2021-03-04 10:27:07 +00:00
..
delete_files	Remove visual console manager extension	2021-01-28 11:57:52 +01:00
mr	Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'	2021-03-04 10:27:07 +00: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	Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'	2021-03-04 10:27:07 +00:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00