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

Skip to content
Commit a37420cd authored by Justin Klaassen's avatar Justin Klaassen
Browse files

resolve merge conflicts of c640e2c4 to ub-deskclock-huddle 

Change-Id: I470ddbf6a1225809501ce573791031b5604b330a
parents b8c4512b c640e2c4
Hide 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