From: Roeland Jago Douma Date: Wed, 23 Aug 2017 13:40:35 +0000 (+0200) Subject: Merge remote-tracking branch 'oc/master' into master-oc X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cdc5c1db43e9eebfde1b5f8428ad4d4ece988f3d;p=nextcloud-desktop.git Merge remote-tracking branch 'oc/master' into master-oc --- cdc5c1db43e9eebfde1b5f8428ad4d4ece988f3d