Jonathan c41b360a6e #8365 merge conflict		2023-11-30 12:04:28 +01:00
..
DEBIAN	Auto-updated build strings.	2023-11-30 01:00:25 +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	#8365 merge conflict	2023-11-30 12:04:28 +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	#8365 merge conflict	2023-11-30 12:04:28 +01:00
images	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-11-28 07:58:50 +01:00
include	#8365 merge conflict	2023-11-30 12:04:28 +01:00
log	…
mobile	fix cv in mobile pandora_enterprise#12297	2023-10-20 09:04:40 +02:00
operation	#8365 merge conflict	2023-11-30 12:04:28 +01: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	#11126 refactored	2023-11-06 15:49:19 +01:00
views	Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards	2023-11-29 15:45:07 +01: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-30 01:00:25 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2023-11-30 01:00:25 +01:00
pandora_console.rhel7.spec	Auto-updated build strings.	2023-11-30 01:00:25 +01:00
pandora_console.spec	Auto-updated build strings.	2023-11-30 01:00:25 +01:00
pandora_console_install	Updated version and build strings.	2023-11-02 11:54:37 +01:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandora_websocket_engine.service	…
pandoradb.sql	#8365 merge conflict	2023-11-30 12:04:28 +01:00
pandoradb_data.sql	#8365 NCM Merge conflict	2023-11-30 08:32:15 +01:00
robots.txt	…
ws.php	…