Gonzalo Acuña 0b1114ef5e Conflicts resolution		2022-06-01 12:39:24 -03:00
..
ansible-galaxy/meta	changing permissions	2019-07-17 12:21:19 +02:00
elastic-stack/ansible-kibana/defaults	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
opendistro	Conflicts resolution (4.3 to master)	2022-05-20 11:05:57 -03:00
wazuh	Conflicts resolution	2022-06-01 12:39:24 -03:00