daniel e00ae31862 Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF ... Conflicts: pandora_console/install.php Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0		2019-02-18 13:16:43 +01:00
..
agentes	Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica	2019-02-15 13:18:10 +01:00
alerts	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
category	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
db	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
events	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
gis_maps	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
groups	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
massive	Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'	2019-02-14 16:15:01 +01:00
modules	Update manage_network_components_form.php	2019-02-13 16:51:22 +01:00
netflow	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
reporting	Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF	2019-02-18 13:16:43 +01:00
servers	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
setup	Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica	2019-02-15 13:18:10 +01:00
snmpconsole	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
tag	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
update_manager	Added changes	2019-02-13 12:21:31 +01:00
users	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
admin_access_logs.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
audit_log_csv.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
extensions.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
menu.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00