Commit 49b165dd authored by kaniini's avatar kaniini

Merge branch 'feature/s3' into 'develop'

S3 support

Closes #65

See merge request pleroma/pleroma!303
parents 5ffaa2bf d22f6665
Pipeline #3372 passed with stages
in 5 minutes and 3 seconds