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

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

Merge branch 'OSE' of ssh://git.dmfs.org:23023/android-tasks/tasks into OSE 

Conflicts:
	src/org/dmfs/tasks/notification/NotificationUpdaterService.java
parents f5f0bb73 16278cc9
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