Skip to content
Snippets Groups Projects
Commit 49b165dd authored by kaniini's avatar kaniini
Browse files

Merge branch 'feature/s3' into 'develop' 

S3 support

Closes #65

See merge request pleroma/pleroma!303
parents 5ffaa2bf d22f6665
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment