Jens Langhammer c83216ece0 Merge branch 'master' into e2e ...

# Conflicts:
#	Pipfile.lock
#	docs/installation/docker-compose.md

2020-06-19 09:00:46 +02:00

..

workflows

Merge branch 'master' into e2e

2020-06-19 09:00:46 +02:00

FUNDING.yml

root: update funding

2020-06-18 19:41:19 +02:00