Merge remote-tracking branch 'upstream/pull/2320'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 06530b7315340fbba3a1df76b6b9babbd7b9a2d4..0a00a6496e13b60c9eb31ede941a1f0bdb11c834 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -126,6 +126,9 @@ gem "mimemagic"
 # Used for browser detection
 gem "browser"
 
+# Used for S3 object storage
+gem "aws-sdk-s3"
+
 # Used to resize user images
 gem "mini_magick"