Commit 52375536 authored by Leander Schulten's avatar Leander Schulten
Browse files

Merge branch 'master' into feature/aubio

# Conflicts:
#	.gitlab-ci.yml
#	src/Lichtsteuerung.pro
parents edd70543 5b9dc8f8
Pipeline #187968 passed with stage
in 4 minutes and 26 seconds