[Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

[Marco Trevisan (Treviño)]

Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master.

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/371500

Update settings override to reflect upstream
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1125 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-desktop/attachments/20190820/b739b808/attachment.diff>