manuasir 699cbccf7e Resolved conflicts		2019-11-12 11:41:28 +01:00
..
ansible-galaxy/meta	changing permissions	2019-07-17 12:21:19 +02:00
elastic-stack	Resolved conflicts	2019-11-12 11:41:28 +01:00
wazuh	Resolved conflicts	2019-11-12 11:41:28 +01:00