Manuel J. Bernal 771396ae9e Fixed conflicts

2019-05-21 23:53:30 +02:00

..

config

Fixed sed command in kibana_settings

2019-05-21 23:46:12 +02:00

Dockerfile

Fixed conflicts

2019-05-21 23:53:30 +02:00