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

Skip to content
Commit b548b3c7 authored by Jon Miranda's avatar Jon Miranda Committed by Jonathan Miranda
Browse files

[DO NOT MERGE] resolve merge conflicts of... 

[DO NOT MERGE] resolve merge conflicts of cfdeb062 to ub-launcher3-qt-future-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id60ae2c08ec7aca6780fec1f873920f3857d598e
parents 30d998c6 cfdeb062
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment