Gonzalo Acuña 1250f3a166 Merge branch '4.4' into merge-4.3-to-4.4		2022-09-15 14:47:48 -03:00
..
default	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
distributed-wazuh	Merge branch '4.4' into merge-4.3-to-4.4	2022-09-15 14:47:48 -03:00
distributed-wazuh-elk/group_vars	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
distributed-wazuh-elk-xpack	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
distributed-wazuh-odfe	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00