Merge branch 'master' into beyond-agentur-master
This commit is contained in:
		
						commit
						aa0f636d8a
					
				| @ -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 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user