fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos ... Conflicts: pandora_console/extras/mr/39.sql pandora_console/include/lib/Module.php		2020-06-30 17:04:33 +02:00
..
delete_files	Remove file - old cluster files	2020-05-22 14:15:10 +02:00
mr	Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos	2020-06-30 17:04:33 +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	Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos	2020-06-30 17:04:33 +02:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00