From: Joshua Sterner <joshua.s.sterner@gmail.com>
Date: Fri, 10 May 2019 06:15:54 +0000 (-0700)
Subject: Merge branch 'master' into master
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~279^2^2~32^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b36dbc435c983b377423357e2c4ea7ece533ee5;p=nextcloud-desktop.git

Merge branch 'master' into master
---

1b36dbc435c983b377423357e2c4ea7ece533ee5