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

Skip to content
Commit 0fc5fcb3 authored by James Lemieux's avatar James Lemieux
Browse files

resolve merge conflicts of bca2b692 to ub-deskclock-escargatoire. 

Change-Id: I14346d1532cb65da0c4d35cd9ddde3edcc6570e1
parents 2d3bb86c bca2b692
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