Merge branch 'feature/s3' into 'develop'

S3 support

Closes #65

See merge request pleroma/pleroma!303

1 files changed, 2 insertions, 0 deletions

diff --git a/mix.exs b/mix.exs
index 941b9c149..6b95eeec3 100644
--- a/mix.exs
+++ b/mix.exs
@@ -46,6 +46,8 @@ defmodule Pleroma.Mixfile do
       {:httpoison, "~> 1.2.0"},
       {:jason, "~> 1.0"},
       {:mogrify, "~> 0.6.1"},
+      {:ex_aws, "~> 2.0"},
+      {:ex_aws_s3, "~> 2.0"},
       {:ex_machina, "~> 2.2", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test}