Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' ... # Conflicts: # pandora_console/extras/mr/28.sql Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd		2019-05-13 17:10:06 +02:00
..
delete_files	errata fix	2019-03-27 16:44:08 +01:00
mr	Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'	2019-05-13 17:10:06 +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	Changed translations strings	2019-04-29 15:17:59 +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-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'	2019-05-13 17:10:06 +02:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00