Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/25.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/agentes/configurar_agente.php pandora_console/install.php pandora_server/util/pandora_db.pl Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949		2019-02-28 17:13:48 +01:00
..
agentes	Merge remote-tracking branch 'origin/develop' into ent-3430-discovery	2019-02-25 14:42:48 +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	Add additional help icons.	2019-02-20 09:04:15 +01:00
netflow	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
reporting	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-02-21 17:21:42 +01:00
servers	Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'	2019-02-27 09:58:42 +01:00
setup	Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch	2019-02-26 12:31:37 +01:00
snmpconsole	Merge from develop	2019-02-22 12:30:27 +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
wizards	minor fixes	2019-02-26 20:23:52 +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	Add menuentry discovery	2019-02-20 18:24:32 +01:00