enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas ... Conflicts: pandora_console/include/help/en/help_alert_config.php pandora_console/include/help/en/help_alert_macros.php pandora_console/include/help/es/help_alert_config.php pandora_console/include/help/es/help_alert_macros.php		2017-11-30 11:47:47 +01:00
..
clippy	Change pandorin dialog font color with black theme - #1060	2017-06-29 18:19:58 +02:00
en	Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas	2017-11-30 11:47:47 +01:00
es	Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas	2017-11-30 11:47:47 +01:00
ja	Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop'	2017-11-29 16:55:24 +01:00