Commit 825ca4c0 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into '903-integrating-kelkoo-product-feeds'

fixed docker-compose

See merge request !1543
parents 27ad7f8d 3b53aa3d