Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' ... # Conflicts: # pandora_console/extras/mr/6.sql		2017-08-31 18:21:08 +02:00
..
mr	Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'	2017-08-31 18:21:08 +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	Fixed pandora diag in oracle version. Ticket#2906	2015-10-19 19:44:26 +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 proxy servers to events response form	2017-08-24 12:34:06 +02:00
sample_login.php	Fixed the lost hash user in the links from metaconsole to the nodes.	2014-11-25 11:07:41 +01:00