Daniel Maya 030ffc55f9 resolved conflict		2023-10-06 09:15:38 +02:00
..
DEBIAN	Auto-updated build strings.	2023-10-06 01:00:29 +02:00
attachment	…
custom/temp/dir/path/mpdf/ttfontdata	…
extensions	11878-Invalid extensions file repo	2023-08-25 13:22:39 +02:00
extras	resolved conflict	2023-10-06 09:15:38 +02:00
fonts	…
general	#12038 header link setup	2023-09-21 10:06:08 +02:00
godmode	resolved conflict	2023-10-06 09:15:38 +02:00
images	Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'	2023-10-03 13:11:09 +00:00
include	resolved conflict	2023-10-06 09:15:38 +02:00
log	…
mobile	…
operation	#12172 Change truncate event name limit to description_size_text	2023-10-04 12:56:28 +02:00
tests	…
tools	…
update_manager_client	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-04 08:16:48 +02:00
vendor	Recovered php version error message	2023-09-07 19:45:14 +02:00
views	Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'	2023-09-28 10:05:15 +00:00
.gitignore	…
.htaccess	…
AUTHORS	…
COPYING	…
ajax.php	…
composer.json	…
composer.lock	…
index.php	…
install.php	Auto-updated build strings.	2023-10-06 01:00:29 +02:00
pandora_console.redhat.spec	Auto-updated build strings.	2023-10-06 01:00:29 +02:00
pandora_console.rhel7.spec	Auto-updated build strings.	2023-10-06 01:00:29 +02:00
pandora_console.spec	Auto-updated build strings.	2023-10-06 01:00:29 +02:00
pandora_console_install	Updated version and build strings.	2023-08-30 09:18:04 +02:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandora_websocket_engine	…
pandora_websocket_engine.service	…
pandoradb.sql	resolved conflict	2023-10-06 09:15:38 +02:00
pandoradb_data.sql	Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'	2023-10-03 13:11:09 +00:00
robots.txt	…
ws.php	…