Merge branch 'feature/custom_media_url' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:49:36 +0000 (23:49 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:49:36 +0000 (23:49 +0000)
commit3e4f39116be3ac6954d643ee7b2f4b2c05625e91
tree88b2ca98dab14648550a25093080a925011e612a
parent14a762a213db0d00550c1421651ef689249c9c57
parent754deb26dd7ad9bf431d6d3edc3004b4f27ca8b0
Merge branch 'feature/custom_media_url' into 'develop'

[Pleroma.Uploaders.Local]: Add configuration for custom url path

See merge request pleroma/pleroma!318