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

Skip to content
Commit 36a90e7f authored by Marten Gajda's avatar Marten Gajda
Browse files

Merge branch 'OSE' into checkboxmode 

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
parents 05e27b61 6e51a378
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