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)
S3 support

Closes #65

See merge request pleroma/pleroma!303


Trivial merge