Commit a449c907 authored by david's avatar david
Browse files

Merge branch 'master' into 'lars-documentation'

# Conflicts:
#   src/engine.py
#   src/mixer.py
parents df321119 cc39a7e0
Pipeline #1159 passed with stage
in 1 minute and 19 seconds