Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 397583db authored by Reece Dunn's avatar Reece Dunn
Browse files

Merge branch 'master' into build 

Conflicts:
	src/synthdata.cpp
	src/voices.cpp
parents 924d1a86 9e730106
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment