manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal ... Conflicts: pandora_console/extras/mr/28.sql Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a		2019-05-10 09:11:17 +02:00
..
delete_files	errata fix	2019-03-27 16:44:08 +01:00
mr	Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal	2019-05-10 09:11:17 +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	Added condition type not normal in alert templates	2019-04-24 10:51:55 +02:00
sample_login.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00