Merge branch 'develop' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)
add tunable for stream uploads, as needed for jortage to work.

See merge request pleroma/pleroma!1708


Trivial merge