From: rinpatch <rinpatch@sdf.org>
Date: Fri, 5 Jul 2019 18:55:27 +0000 (+0000)
Subject: Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3589b30ddc9d0c23ca6f00264cff05e53be1b270;p=akkoma

Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'

tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir

Closes #1058

See merge request pleroma/pleroma!1378
---

3589b30ddc9d0c23ca6f00264cff05e53be1b270