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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a49db0e7bf3c1ccbf652d50b4aa15afcbbe5dc2e..7e9be257b4969997204625b53ff787390dc008cc 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ gem "logstasher"
 gem "bzip2-ffi"
 gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
-gem "mimemagic"
+gem "marcel"
 
 # Used for browser detection
 gem "browser"