Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' ... # Conflicts: # pandora_console/extras/mr/65.sql		2023-07-10 09:43:28 +00:00
..
make_solaris_package	Update copyright years	2023-07-03 09:20:25 -06:00
pandora_agent.conf	Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix'	2023-07-10 09:43:28 +00:00