Tatiana Llorente 6c9ce7e65b Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica ... Conflicts: pandora_console/godmode/setup/setup_general.php pandora_console/include/styles/pandora.css pandora_console/install.php Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd		2019-02-15 13:18:10 +01:00
..
file_manager.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
gis.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
gis_step_2.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
license.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
links.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
news.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
os.builder.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
os.list.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
os.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
performance.php	Fixed minor error	2019-02-14 16:53:01 +01:00
setup.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
setup_auth.php	Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte	2019-02-06 16:11:46 +01:00
setup_ehorus.php	Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte	2019-02-06 16:11:46 +01:00
setup_general.php	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
setup_netflow.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
setup_visuals.php	Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico	2019-02-07 07:58:33 +01:00
snmp_wizard.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00