Alejandro Campos 0c41459b83 Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' ... # Conflicts: # pandora_console/extras/mr/53.sql		2022-03-16 14:07:23 +00:00
..
delete_files	cleaned files	2022-02-25 14:12:12 +01:00
mr	Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM'	2022-03-16 14:07:23 +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	Modules percentage threshold form	2021-11-24 11:33:36 +01:00
pandoradb_migrate_6.0_to_759.mysql.sql	Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas	2022-02-23 12:11:44 +01:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00