Merge branch 'master' into beyond-agentur-master

This commit is contained in:
André Bauer 2017-11-19 18:27:05 +01:00
commit aa0f636d8a

View File

@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.0 FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.3
MAINTAINER Zammad <info@zammad.org> MAINTAINER Zammad <info@zammad.org>
ARG BUILD_DATE ARG BUILD_DATE