Nicolas Lastra bc63b757b4 Remove git conflict markers		2021-10-13 10:10:20 -03:00
..
ansible-filebeat	adding acl to debian/ubuntu installation	2021-07-15 14:29:46 +07:00
ansible-filebeat-oss	adding acl to debian/ubuntu installation	2021-07-15 14:29:46 +07:00
ansible-wazuh-agent	Remove git conflict markers	2021-10-13 10:10:20 -03:00
ansible-wazuh-manager	merge de 4.2 a master	2021-10-01 12:24:53 -03:00