From: Roeland Jago Douma <rullzer@users.noreply.github.com>
Date: Tue, 4 Apr 2017 08:24:32 +0000 (+0200)
Subject: Merge pull request #3896 from nextcloud/xx621998xx-newbranch
X-Git-Tag: v12.0.0beta1~231
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c0972a26ed6737bcc9d0288f51c0371b98c81a61;p=nextcloud-server.git

Merge pull request #3896 from nextcloud/xx621998xx-newbranch

Fix remaining upload time calculation
---

c0972a26ed6737bcc9d0288f51c0371b98c81a61