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

Skip to content
Commit f474e0d8 authored by Mady Mellor's avatar Mady Mellor
Browse files

resolve merge conflicts of 311e1db1 to qt-r1-bubbles-dev 

Bug: None
Test: atest BubbleControllerTest StatusBarWindowControllerTest
Change-Id: If29e2a290a2dac28835a206e0b5980482c5f50b4
parents 3efcdc3c 311e1db1
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