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

Commit b64b57dd authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Merge branch 'uiext-1.5r2' into themes-uiext-1.5r2 

Conflicts:
	core/res/res/values/attrs.xml
	core/res/res/values/public.xml
	core/res/res/values/styles.xml
	core/res/res/values/themes.xml
parents 1507c385 9e7c946a
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