From: Camila Ayres <smayres@gmail.com>
Date: Fri, 12 Apr 2019 13:50:55 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~279^2^2~61^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33baf400615c543a3fe592c9e1c959c6c54e1ac7;p=nextcloud-desktop.git

Merge branch 'master' into master
---

33baf400615c543a3fe592c9e1c959c6c54e1ac7