Skip to content
Snippets Groups Projects
Commit a449c907 authored by David Trattnig's avatar David Trattnig
Browse files

Merge branch 'master' into 'lars-documentation'

# Conflicts:
#   src/engine.py
#   src/mixer.py
parents df321119 cc39a7e0
No related branches found
No related tags found
1 merge request!7Grammar and other documentation issues
Showing with 243 additions and 168 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment