Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 5 Jul 2019 18:55:27 +0000 (18:55 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 5 Jul 2019 18:55:27 +0000 (18:55 +0000)
commit3589b30ddc9d0c23ca6f00264cff05e53be1b270
treecb18b20348c32db9ce0b6a233fd37180bfc37328
parentc1c00914415099a782bfc064dafd474394f5f201
parent977c2d044810d71fa89f9976ef342b6f708a027a
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