Gonzalo Acuña 0b1114ef5e Conflicts resolution		2022-06-01 12:39:24 -03:00
..
ansible-filebeat/defaults	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
ansible-filebeat-oss	Bump to 4.4.0	2022-06-01 12:25:12 -03:00
ansible-wazuh-agent	Conflicts resolution	2022-06-01 12:39:24 -03:00
ansible-wazuh-manager	Conflicts resolution	2022-06-01 12:39:24 -03:00
vars	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
wazuh-dashboard	Bump to 4.4.0	2022-06-01 12:25:12 -03:00
wazuh-indexer	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00