Merge branch 'cleanup/deprecated_config_upload' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 18 Oct 2019 11:34:48 +0000 (11:34 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 18 Oct 2019 11:34:48 +0000 (11:34 +0000)
commit724f611b0edf3d7fd819ee748df2f6b00d211fa2
treefc1952244558e57faa18b6d3f0d72b61b215f2c7
parent7511f3d192bff285d0ca22c03cd9a46fd552cdde
parent3c6fd0bb991c865aad2fb27bc798b2b3c3c248d2
Merge branch 'cleanup/deprecated_config_upload' into 'develop'

upload.ex: Remove deprecated configuration

See merge request pleroma/pleroma!1855