Merge branch 'bugfix/s3-configuration' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:50:44 +0000 (04:50 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:50:44 +0000 (04:50 +0000)
commit340ab3cb9068d444b77213e07beb8c2c3ca128b9
treed256ed7f65cc51faf86c3e220ff986ca3e81058e
parent03ecbe045605d04d7ceba2f3b5d16d620d97e8b2
parentde5bd6fc65d478b9d3ff9b6f875cb20cc2e411d9
Merge branch 'bugfix/s3-configuration' into 'develop'

config: fix up defaults for s3 endpoint configuration

See merge request pleroma/pleroma!312