diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-23 20:38:53 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-23 20:38:53 +0000 |
| commit | f60beecfa7891d06018f8065b865188118e99eac (patch) | |
| tree | ab6ce289d6cedbb273832c7e56d273990b537c38 /lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex | |
| parent | ad2ffd7ef1cbb8afff6ecee2cbda79414a12fbaa (diff) | |
| parent | 63af6951fa42429d0a02861d5ad1afdd053864cf (diff) | |
| download | pleroma-f60beecfa7891d06018f8065b865188118e99eac.tar.gz | |
Merge branch 'develop' into 'develop'
add tunable for stream uploads, as needed for jortage to work.
See merge request pleroma/pleroma!1708
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex')
0 files changed, 0 insertions, 0 deletions