Merge branch 'fix/reserve-media-username' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 2 Jan 2019 16:23:46 +0000 (16:23 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 2 Jan 2019 16:23:46 +0000 (16:23 +0000)
commitd1983ed0282f1ae485f73024f25ec2753901fa8a
tree6431d9bb666b6acc9eb694d371608002d7ec01de
parent32bed664714c616d4a75579b450e52dcff5d8134
parent5142b50f39b91c7de1a1c06c5038e7d9984d97de
Merge branch 'fix/reserve-media-username' into 'develop'

Reserve /media

See merge request pleroma/pleroma!620
config/config.exs