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

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

resolve merge conflicts of 1cf96ee5 to ub-deskclock-escargatoire. 

Change-Id: I38a50e55e85aff0a23476da5cd7bdee2dbf7b084
parents a9489547 1cf96ee5
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