Manuel J. Bernal 6c630f27d5 Resolved conflicts		2020-06-19 12:46:09 +02:00
..
ansible-filebeat	Resolved conflicts	2020-06-19 12:46:09 +02:00
ansible-filebeat-oss	Remove flag to allow exec on deleted cert	2020-06-12 17:38:17 +02:00
ansible-wazuh-agent	Lint changes	2020-05-14 18:13:53 +02:00
ansible-wazuh-manager	Merge pull request #424 from wazuh/feature-kibana-opendistro	2020-06-18 18:04:49 +02:00