Tatiana Llorente 35633d181b Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral ... Conflicts: pandora_console/install.php Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6		2019-03-05 13:20:59 +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	Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch	2019-02-26 12:31:37 +01:00
setup.php	Merge from develop	2019-02-22 12:30:27 +01:00
setup_auth.php	Fixed ldap conf tooltips	2019-03-05 09:09:24 +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	Unified sizes of the checkbox switch	2019-02-26 12:04:18 +01:00
setup_netflow.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
setup_notifications.php	avoid to show notification if disabled by user	2019-02-18 17:08:23 +01:00
setup_visuals.php	new header and menu	2019-03-05 12:54:11 +01:00
snmp_wizard.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00