Merge branch 'feature/s3' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 28 Aug 2018 00:29:49 +0000 (00:29 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 28 Aug 2018 00:29:49 +0000 (00:29 +0000)
commit49b165ddc61091fc192e6f8a252c9a02a5fcef2d
tree0e976ea10a0c83d5cbcd185e54d738117c534c31
parent5ffaa2bf69679f118af9736d62535cc4eb870709
parentd22f66655b0693ebcf9291f7e443a7d7de2d28c6
Merge branch 'feature/s3' into 'develop'

S3 support

Closes #65

See merge request pleroma/pleroma!303