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)
commitf60beecfa7891d06018f8065b865188118e99eac
treeab6ce289d6cedbb273832c7e56d273990b537c38
parentad2ffd7ef1cbb8afff6ecee2cbda79414a12fbaa
parent63af6951fa42429d0a02861d5ad1afdd053864cf
Merge branch 'develop' into 'develop'

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

See merge request pleroma/pleroma!1708