Merge branch 'master' into notes
[rails.git] / config / initializers / mime_types.rb
index 72aca7e441e1855f8c7a7ac1f1cbe5d42cd1235b..be247274f290811f0ccf61b7dee2b6a488343bc9 100644 (file)
@@ -3,3 +3,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