Merge branch 'modify-config.md-for-S3' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 24 Jun 2019 05:32:03 +0000 (05:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 24 Jun 2019 05:32:03 +0000 (05:32 +0000)
commit58d567ddc56701825804482331bdcc75f601535c
treef041f702ba575d34df3621503becfe1f730b550c
parent826d0424c12753db5e356926eba002639f157d5c
parent550302c041139de43052022c0f73cba2b30a3080
Merge branch 'modify-config.md-for-S3' into 'develop'

Modify config.md for s3

See merge request pleroma/pleroma!1331