Daniel Rodriguez 52c4b3dab1 Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop' ... add params setup historic database See merge request artica/pandorafms!2154 Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed		2019-02-14 17:00:56 +01:00
..
agentes	Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI	2019-02-13 14:55:21 +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	Fixed conflict	2019-02-07 17:59:55 +01:00
servers	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
setup	Fixed minor error	2019-02-14 16:53:01 +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