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

Commit 54a8d7a9 authored by Reece H. Dunn's avatar Reece H. Dunn
Browse files

Merge branch 'upstream' into development 

Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/fa-en-us
	phsource/compile_report
	phsource/mbrola/ir1
parents ac2932cc bb057791
Expand all Show 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