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

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

resolve merge conflicts of 90ce7e99 to ub-deskclock-escargatoire 

Change-Id: I4ceb29c75a0148ea3f6738b006d273b8f7e50d7f
parents f7a62509 90ce7e99
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