Jesus Linares e275dc9446 Merge branch '3.7.2_6.5.3' ...

Conflicts:
	README.md
	VERSION
	docker-compose.yml
	kibana/Dockerfile
	wazuh/Dockerfile

2018-12-20 11:50:30 -05:00

..

config

entrypoint.sh updated so docker upgrade is posible

2018-12-19 20:05:33 +01:00

Dockerfile

Merge branch '3.7.2_6.5.3'

2018-12-20 11:50:30 -05:00