From: rinpatch <rinpatch@sdf.org>
Date: Mon, 23 Sep 2019 20:38:53 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f60beecfa7891d06018f8065b865188118e99eac;p=akkoma

Merge branch 'develop' into 'develop'

add tunable for stream uploads, as needed for jortage to work.

See merge request pleroma/pleroma!1708
---

f60beecfa7891d06018f8065b865188118e99eac