Manuel J. Bernal 6c630f27d5 Resolved conflicts		2020-06-19 12:46:09 +02:00
..
ansible-galaxy/meta	changing permissions	2019-07-17 12:21:19 +02:00
elastic-stack	Merge pull request #433 from pescobar/add_elastic_option_path.repo	2020-06-18 18:21:33 +02:00
opendistro	Resolved conflicts	2020-06-19 12:46:09 +02:00
wazuh	Resolved conflicts	2020-06-19 12:46:09 +02:00