Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' ... # Conflicts: # pandora_console/extras/mr/32.sql		2019-09-23 17:16:15 +02:00
..
delete_files	Added delete_files entry for recon view deletion	2019-06-27 16:58:48 +02:00
mr	Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'	2019-09-23 17:16:15 +02: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	Deleted tests	2019-09-18 15:41:20 +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 branch 'develop' into 'ent-4461-Configuracion-integracion-integria'	2019-09-23 17:16:15 +02:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00