Matias Didier 447e788ab3 Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop' ... Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado See merge request artica/pandorafms!6587		2023-11-28 14:14:26 +00:00
..
DEBIAN	Auto-updated build strings.	2023-11-28 01:00:28 +01:00
attachment	…
custom/temp/dir/path/mpdf/ttfontdata	…
extensions	Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'	2023-11-28 07:07:58 +00:00
extras	re merge mr changes	2023-11-28 10:59:04 +01:00
fonts	…
general	Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop'	2023-11-27 12:12:10 +00:00
godmode	Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'	2023-11-28 14:14:26 +00:00
images	…
include	Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'	2023-11-28 14:14:26 +00:00
log	…
mobile	…
operation	Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop'	2023-11-27 14:51:48 +00:00
tests	…
tools	…
update_manager_client	Merge branch 'ent-12117-Comprobar-archivos-antes-de-actualizar-oum' into 'develop'	2023-11-27 16:48:31 +00:00
vendor	…
views	Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'	2023-11-28 07:09:11 +00:00
.gitignore	…
.htaccess	…
AUTHORS	…
COPYING	…
ajax.php	…
composer.json	…
composer.lock	…
cron.php	…
index.php	fix update manager pandora_enterprise#12479	2023-11-20 17:19:39 +01:00
install.php	Auto-updated build strings.	2023-11-28 01:00:28 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2023-11-28 01:00:28 +01:00
pandora_console.rhel7.spec	Auto-updated build strings.	2023-11-28 01:00:28 +01:00
pandora_console.spec	Auto-updated build strings.	2023-11-28 01:00:28 +01:00
pandora_console_install	…
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandora_websocket_engine.service	…
pandoradb.sql	#12138 Resolve conflict	2023-11-27 11:43:24 +01:00
pandoradb_data.sql	re merge mr changes	2023-11-28 10:59:04 +01:00
robots.txt	…
ws.php	…