From: István Váradi <ivaradi@users.noreply.github.com>
Date: Sat, 15 Aug 2020 10:56:13 +0000 (+0200)
Subject: Merge branch 'master' into cstdint-fix
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~226^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=387df7ae7192572dc3db1040539b3a5e5b238a44;p=nextcloud-desktop.git

Merge branch 'master' into cstdint-fix
---

387df7ae7192572dc3db1040539b3a5e5b238a44