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

[rails.git] / config / initializers / mime_types.rb

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index be247274f290811f0ccf61b7dee2b6a488343bc9..7e10da4fbfe29de123adf4687419812a9ccf38e5 100644 (file)
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,6 +2,4 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register "application/x-amf", :amf
 Mime::Type.register "application/gpx+xml", :gpx