Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

docker-compose.yml

@@ -38,6 +38,7 @@ services:
       - storage:/mnt/opaque
       - ./logs:/home/opaque_daemon/logs
       - ../opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
+      - ../opaque_daemon/merge_corpus_files.py:/home/merge_corpus_files.py
       - ../opaque_daemon/config.ini:/home/opaque_daemon/config.ini
       - ../opaque_daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
       - $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json