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

Skip to content
Commit 68ab4623 authored by tobias's avatar tobias
Browse files

Merge branch 'OSE' of 

ssh://gitosis@git.dmfs.org:23023/android-tasks/tasks.git into OSE

Conflicts:
	res/values/colors.xml
parents f3ade746 2bde2dfd
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