From: tobiasKaminsky Date: Mon, 26 Oct 2015 21:15:56 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta X-Git-Tag: beta-20151122~103 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7b780553be6b386d226b5b22e08291f0cbcfb931?ds=inline;hp=--cc Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta --- 7b780553be6b386d226b5b22e08291f0cbcfb931