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

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

Merge branch 'pin' into staging 

Conflicts:
	AndroidManifest.xml
	src/org/dmfs/tasks/TaskGroupPagerAdapter.java
parents 1cc095ac 844d2a9e
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