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

Commit 584a7aa6 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

resolved conflicts for merge of ff0978fd to master-lockscreen-dev 

Change-Id: I03881da30db8189005d50812e5528ed07cebd437
parents a0b2be85 ff0978fd
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