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

Skip to content
Commit f9db8142 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

Conflicts:
	res/values-in/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nb/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-th/cm_strings.xml

Change-Id: I152152f769d34de37787a15e157da12aa01a8b66
parents 637e2f0c b6783c46
Hide whitespace changes
Inline Side-by-side
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