Commit e759919d authored by Gregor Moenke's avatar Gregor Moenke

Merge branch 'master' into 'develop'

# Conflicts:
#   pyboat/plotting.py
#   pyboat/ui/synth_gen.py
parents 797e67c7 c6863ed0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment