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

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

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e441e1855f8c7a7ac1f1cbe5d42cd1235b..576da5285f51cbcd400145e7718dd0f10c3b0835 100644 (file)
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,4 +2,5 @@
 
 # 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