GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Nicolas Fella authored Oct 31, 2019 and Bhushan Shah committed Oct 31, 2019

This simplifies the lockscreen code.

with different visibility rules

Jonah Brüchert authored Oct 17, 2019 and Bhushan Shah committed Oct 21, 2019

Also remove visible condition, it makes it impossible to remove the search query if no results are found.

Alexander Akulich authored Oct 11, 2019 and Bhushan Shah committed Oct 11, 2019

instead loop through available accounts and select the account which
supports either ofono or tel protocol

doesn't break flicking on touch

show plasmoids full rep in a flickable under quicksettings