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

Skip to content
Commit 68041d09 authored by Reece H. Dunn's avatar Reece H. Dunn
Browse files

Merge branch 'upstream' into development 

Conflicts:
	dictsource/dict_phonemes
	dictsource/sl_list
	dictsource/sl_rules
	phsource/compile_report
	src/synthdata.cpp
parents 87896196 93674337
Expand all 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